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
..
ajax	write_close the session when scanning files or music	2012-06-16 01:35:39 +02:00
appinfo	utf8 in der DB config	2012-06-11 23:04:28 +02:00
css	adding proper copyright and license notice to the style files	2012-04-23 14:19:03 +02:00
js	correct presentation of HTML encoded characters	2012-06-21 09:44:20 +02:00
l10n	update translations	2012-06-06 00:29:28 +02:00
server	Correct remote and public, and last occurence of OC::	2012-06-06 20:24:15 +00:00
templates	removing executable bit - again	2012-05-15 00:52:00 +02:00
index.php	remove not needed includes	2012-05-28 13:57:45 +02:00
lib_ampache.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
lib_collection.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
lib_media.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
lib_scanner.php	use new sanitizeHTML() function	2012-06-20 12:23:26 +02:00
remote.php	Correct remote and public, and last occurence of OC::	2012-06-06 20:24:15 +00:00
settings.php	removing executable bit - again	2012-05-15 00:52:00 +02:00