iglocska 6895548877 Merge branch 'develop' into feature/discussion ... - Pivots, attributes, discussions hideable Conflicts: app/Controller/EventsController.php app/webroot/css/main.css		2013-09-10 16:51:56 +02:00
..
empty	Merge branch 'master' into develop	2012-11-20 11:01:18 +01:00
eventdiscussion.ctp	AJAX upgrade to the discussion board	2013-08-19 17:26:06 +02:00
footer.ctp	UI changes applied to the actions menu	2013-07-04 13:35:04 +02:00
global_menu.ctp	Merge branch 'develop' into feature/discussion	2013-09-10 16:51:56 +02:00
img.ctp	Some UI changes	2013-06-27 12:08:58 +02:00
pivot.ctp	Merge branch 'develop' into feature/discussion	2013-09-10 16:51:56 +02:00