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
@@ -23,7 +23,7 @@ class Gemeinde extends APIv1_Controller
{
parent::__construct(array('Gemeinde' => 'basis/gemeinde:rw', 'GemeindeByPlz' => 'basis/gemeinde:r'));
// Load model GemeindeModel
$this->load->model("codex/gemeinde_model", "GemeindeModel");
$this->load->model('codex/gemeinde_model', 'GemeindeModel');
}
/**