Hypolite Petovan d7f80bf7e7 Merge branch 'develop' into improvement/frio-action-links-to-buttons ... # Conflicts: # view/theme/frio/js/filebrowser.js # view/theme/frio/templates/filebrowser.tpl		2017-03-25 20:27:26 -04:00
..
event_edit.js
filebrowser.js	Merge branch 'develop' into improvement/frio-action-links-to-buttons	2017-03-25 20:27:26 -04:00
hovercard.js
mod_display.js
mod_events.js
modal.js
textedit.js
theme.js