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
..
Config	Merge branch 'hotfix-2.1.15' into develop	2013-08-29 12:43:49 +02:00
Console	Some cleanup	2013-07-11 10:47:44 +02:00
Controller	Merge branch 'develop' into feature/discussion	2013-09-10 16:51:56 +02:00
Lib	coding standards	2012-12-19 13:34:40 +00:00
Locale/eng/LC_MESSAGES	Merge branch 'master' into develop	2012-11-20 11:01:18 +01:00
Model	Merge branch 'develop' into feature/discussion	2013-09-10 16:51:56 +02:00
Plugin	Removal of the blacklist	2013-07-05 14:34:32 +02:00
Vendor	Merge branch 'master' into develop	2012-11-20 11:01:18 +01:00
View	Merge branch 'develop' into feature/discussion	2013-09-10 16:51:56 +02:00
files	Merge branch 'master' into develop	2012-11-20 11:01:18 +01:00
tmp	Merge branch 'master' into develop	2012-09-17 13:02:53 +02:00
webroot	Merge branch 'develop' into feature/discussion	2013-09-10 16:51:56 +02:00
.htaccess	Merge branch 'master' into develop	2012-11-20 11:01:18 +01:00
Makefile	Static program analysis	2012-12-19 03:08:52 +00:00
index.php	Merge branch 'master' into develop	2012-11-20 11:01:18 +01:00