paolo 030fe2ba74 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

2016-05-04 15:34:00 +02:00

..

Ablauf_model.php

Models

2016-05-04 07:05:23 +02:00

Antwort_model.php

Models

2016-05-04 07:05:23 +02:00

Frage_model.php

Models

2016-05-04 07:05:23 +02:00

Gebiet_model.php

Models

2016-05-04 07:05:23 +02:00

Kategorie_model.php

Models

2016-05-04 07:05:23 +02:00

Kriterien_model.php

Merge origin/ci into ci

2016-05-04 15:34:00 +02:00

Pruefling_model.php

Models

2016-05-04 07:05:23 +02:00

Vorschlag_model.php

Models

2016-05-04 07:05:23 +02:00