Merge branch 'master' into permissions

This commit is contained in:
Paolo
2018-06-28 14:52:09 +02:00
72 changed files with 655 additions and 381 deletions
@@ -22,7 +22,7 @@ class Manager extends Auth_Controller
);
// Load helpers to upload files
$this->load->helper(array('form', 'url'));
$this->load->helper('form');
// Loads the extensions library
$this->load->library('ExtensionsLib');