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
@@ -29,7 +29,7 @@ class Studienplan extends APIv1_Controller
)
);
// Load model PersonModel
$this->load->model("organisation/studienplan_model", "StudienplanModel");
$this->load->model('organisation/studienplan_model', 'StudienplanModel');
}
public function getStudienplan()