Brice Maron 4753cc3ebd Merge branch 'master' into multi_app_dir ... Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php		2012-06-14 21:16:59 +00:00
..
ajax	restore require once command for non app files	2012-04-18 17:49:50 +02:00
css	Fix remap dir for CSS minimizer	2012-06-05 18:09:32 +02:00
img	oc-657: icons for M$ office file types	2012-05-21 09:35:31 +02:00
js	Merge branch 'master' into multi_app_dir	2012-06-14 21:16:59 +00:00
l10n	update translations	2012-06-06 00:29:28 +02:00
lostpassword	urlencode link fort password reset (bug #970)	2012-06-13 17:22:28 +02:00
templates	Merge branch 'master' into multi_app_dir	2012-06-14 21:16:59 +00:00
minimizer.php	Load apps before minimizing the core css and js	2012-06-04 23:17:50 +02:00
strings.php	reuse OC_L10N objects	2012-04-14 16:44:15 +02:00