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
..
appinfo	Remove OC_App::register function	2012-05-31 13:01:30 +02:00
host-meta.php	no use for double quotes here	2012-05-17 21:03:06 +02:00
webfinger.php	Merge branch 'master' into multi_app_dir	2012-06-21 17:15:35 +00:00