Michael RICOIS 4827b09d7a Merge remote-tracking branch 'origin/develop' into wip-2.9-design2016 ... Conflicts: .gitignore application/layouts/default/footer.phtml library/Application/Controller/Plugin/Theme.php		2016-09-05 11:40:34 +02:00
..
configs	Page détail des privilèges	2016-06-17 16:20:51 +02:00
languages	Merge	2014-05-01 17:19:47 +00:00
layouts	Remove IE6 upgrade information	2016-08-30 17:13:49 +02:00
modules	Merge remote-tracking branch 'origin/develop' into wip-2.9-design2016	2016-09-05 11:40:34 +02:00
Bootstrap.php	Module admin	2016-05-26 16:29:58 +02:00