blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 16:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/ci into ci

Browse Source 
Conflicts:
	application/core/FHC_Model.php
	application/models/Nation_model.php
	application/models/lehre/Studiengang_model.php
	application/models/lehre/Studienplan_model.php
This commit is contained in:
paolo
2016-05-04 15:34:00 +02:00
parent 53eab958dd 1a36ce3dff
commit 030fe2ba74
221 changed files with 3055 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/organisation/Organisationseinheit_model.php
+3 -6
View File
@@ -1,16 +1,13 @@
<?php
class Organisationseinheit_model extends DB_Model
{
/**
* Constructor
*/
public function __construct()
{
parent::__construct();
$this->dbTable='public.tbl_organisationseinheit';
$this->pk='oe_kurzbz';
$this->dbTable = 'public.tbl_organisationseinheit';
$this->pk = 'oe_kurzbz';
}
}
}