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
..
AdminCrudComponent.php	Quick fix for strict warning over an incorrect argument	2013-05-23 11:33:36 +02:00
CidrComponent.php	Preparing for the scheduled tasks	2013-12-17 10:15:04 +01:00
IOCExportComponent.php	Further work on the sharing groups	2015-04-13 17:52:04 +02:00
IOCImportComponent.php	Various fixes to the OpenIOC import and the password reset, fixes #600, fixes #599, fixes #565	2015-08-19 13:20:14 +02:00
SecureAuthComponent.php	Very large PGP keys would prevent users from logging in - fixes #142	2014-04-01 16:20:47 +02:00
empty	Merge branch 'master' into develop	2012-11-20 11:01:18 +01:00