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
@@ -25,7 +25,7 @@ class Studienjahr extends Auth_Controller
)
);
$this->load->model("organisation/Studienjahr_model", "StudienjahrModel");
$this->load->model('organisation/Studienjahr_model', 'StudienjahrModel');
}
/**
@@ -25,8 +25,8 @@ class Studiensemester extends Auth_Controller
)
);
$this->load->model("organisation/Studiensemester_model", "StudiensemesterModel");
$this->load->model("organisation/Studienjahr_model", "StudienjahrModel");
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
$this->load->model('organisation/Studienjahr_model', 'StudienjahrModel');
}
/**