Brice Maron e5c56b2433 Merge branch 'master' into multi_app_dir ... Conflicts: lib/app.php lib/base.php lib/minimizer/css.php lib/minimizer/js.php lib/template.php lib/util.php		2012-06-21 17:15:35 +00:00
..
css.php	Merge branch 'master' into multi_app_dir	2012-06-21 17:15:35 +00:00
js.php	Use TemplateLayout functions for finding js and css files in minimizer	2012-06-18 15:40:48 +02:00