Merge origin/ci into ci

Conflicts: application/core/FHC_Model.php application/models/Nation_model.php application/models/lehre/Studiengang_model.php application/models/lehre/Studienplan_model.php
2026-07-24 02:12:17 +00:00 · 2016-05-04 15:34:00 +02:00
parent 53eab958dd 1a36ce3dff
commit 030fe2ba74
221 changed files with 3055 additions and 169 deletions
@@ -0,0 +1,14 @@
+<?php
+class Studienplan_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_studienplan';
+		$this->pk = 'studienplan_id';
+	}
+}