Michael Gapczynski ea23854328 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/contacts/templates/part.chooseaddressbook.rowfields.php		2012-08-06 13:49:54 -04:00
..
ajax	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
appinfo	fix remote and public.php	2012-07-13 22:44:35 +02:00
css	adding proper copyright and license notice to the style files	2012-04-23 14:19:03 +02:00
js	Make file actions permissions aware	2012-07-25 16:33:08 -04:00
l10n	[tx-robot] updated from transifex	2012-07-31 22:57:24 +02:00
lib/share	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04: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 superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
lib_ampache.php	Set filter to empty if not set by Ampache client	2012-07-27 18:10:40 -04:00
lib_collection.php	remove unused variables	2012-07-20 18:56:18 +02:00
lib_media.php	remove unused variables	2012-07-20 18:56:18 +02:00
lib_scanner.php	Don't call getLocalFile() until you know it actually is music	2012-06-26 14:51:31 -04:00
remote.php	Correct remote and public, and last occurence of OC::	2012-06-06 20:24:15 +00:00
settings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00