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
..
app.php	change some function names in OC_Calendar_Repeat	2012-06-15 11:34:21 +02:00
database.xml	fix merge conflicts	2012-06-13 11:40:00 +02:00
info.xml	mark the apps as part of the shipped package and increase the requirement to ownCloud 4	2012-05-18 16:06:57 +02:00
remote.php	Correct remote and public, and last occurence of OC::	2012-06-06 20:24:15 +00:00
update.php	change some function names in OC_Calendar_Repeat	2012-06-15 11:34:21 +02:00
version	fix merge conflicts	2012-06-13 11:40:00 +02:00