Thomas Müller db39fede97 Merge branch 'master' into appframework-master ... Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php		2013-09-25 09:52:12 +02:00
..
ajax	Merge branch 'master' into appframework-master	2013-09-25 09:52:12 +02:00
appinfo	Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading	2013-09-21 11:54:06 -07:00
command	Add copyright, remove starting blank line	2013-09-19 19:12:16 +02:00
css	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-19 17:00:54 +02:00
js	implement previews for public upload	2013-09-23 12:27:05 +02:00
l10n	[tx-robot] updated from transifex	2013-09-24 12:59:48 -04:00
lib	Merge branch 'master' into appframework-master	2013-09-25 09:52:12 +02:00
templates	Fix not displaying "Upload something!" message	2013-09-23 16:39:42 +02:00
tests	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
admin.php	Remove outdated comments	2013-01-26 14:03:17 +01:00
download.php	merge master into filesystem	2013-01-28 19:37:58 +01:00
index.php	remove unneccessary lib in namespace	2013-09-20 16:46:33 +02:00
settings.php	merge master into filesystem	2013-01-28 19:37:58 +01:00
triggerupdate.php	Add a CLI script for manually triggering checking a folder for updates	2013-06-23 17:49:38 +02:00