Iglocska 704880ce59 Merge branch 'master' into feature/sg ... Conflicts: VERSION.json app/Controller/AttributesController.php app/Controller/EventsController.php app/Model/Attribute.php app/Model/Event.php app/Model/Server.php		2015-08-30 13:29:05 +02:00
..
css	Merge branch 'master' into feature/sg	2015-06-10 22:54:20 +02:00
files	Migration to CakePHP 2.1.	2012-03-15 15:06:45 +01:00
img	move CERT.at logo file	2014-12-21 23:55:14 +01:00
js	Merge branch 'master' into feature/sg	2015-08-30 13:29:05 +02:00
.gitignore	minor changes	2013-06-24 15:12:30 +02:00
.htaccess	Logging in for REST using Authorized HTTP header field.	2012-04-06 16:32:33 +02:00
favicon.ico	Migration to CakePHP 2.1.	2012-03-15 15:06:45 +01:00
index.php	Fix to issues with the install script	2014-02-09 16:44:48 +01:00
robots.txt	…