Iglocska e0ef372392 Merge branch 'master' into feature/sg ... Conflicts: app/Controller/EventsController.php app/Controller/UsersController.php app/Model/Event.php		2015-04-12 10:40:31 +02:00
..
ajax	Further work on the sharing groups	2015-04-07 00:24:44 +02:00
add.ctp	SSL certificate changes	2014-01-16 08:47:25 +01:00
edit.ctp	Changes to the sync action pages	2014-01-21 16:41:32 +01:00
index.ctp	UI now correctly shows if self-signed certificates are allowed for a link	2014-02-17 11:44:16 +01:00
pull.ctp	Work on the background job and the proposals	2014-01-05 21:30:39 +01:00
push.ctp	Merge branch 'feature/roleChanges' into feature/XML_and_UI	2013-10-25 10:39:18 +02:00
server_settings.ctp	Add proxy section to server diagnostics	2015-03-19 12:15:28 +01:00