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
This commit is contained in:
paolo
2016-05-04 15:34:00 +02:00
221 changed files with 3055 additions and 169 deletions
@@ -0,0 +1,14 @@
<?php
class Server_model extends DB_Model
{
/**
* Constructor
*/
public function __construct()
{
parent::__construct();
$this->dbTable = 'system.tbl_server';
$this->pk = '';
}
}