xevidos 954d6a43d0 Merge branch 'development' into 'permissions' ... # Conflicts: # components/filemanager/class.filemanager.php # components/filemanager/controller.php		2019-07-17 15:55:45 +00:00
..
class.active.php	Continued work on new permissions system, Fixed active file listings bug	2019-07-02 16:46:32 -04:00
controller.php	Continued work on new permissions system, Fixed active file listings bug	2019-07-02 16:46:32 -04:00
dialog.php	Updated for PHP 7.2, modified save message function, Updated Collaboration for newer versions.	2018-07-13 12:39:55 -04:00
init.js	Merge branch 'development' into 'permissions'	2019-07-17 15:55:45 +00:00