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

..

api

Merge origin/ci into ci

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

message

Message

2016-04-05 09:36:24 +02:00

rdf

PHPCI

2016-03-20 12:53:17 +01:00

DBTools.php

API-Struktur und CodeSniffer Verbesserungen

2016-04-11 08:11:15 +02:00

Examples.php

Merge

2016-04-08 06:45:35 +02:00

index.html

CI Init

2016-02-29 16:51:21 +01:00

Main.php

PHPCI

2016-03-20 12:53:17 +01:00

ModelTest.php

ACL-System

2016-05-02 16:07:25 +02:00

Pages.php

CI Init

2016-02-29 16:51:21 +01:00

Rest_server.php

Move Kontakt-Controller to person folder

2016-04-11 06:40:37 +02:00

Vilesci.php

ACL-Fix

2016-05-01 11:53:15 +02:00

Welcome.php

CI Init

2016-02-29 16:51:21 +01:00