nextcloud/apps/files
Bart Visscher 6081bfa2bc Merge branch 'master' into routing
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
2012-10-17 16:38:11 +02:00
..
ajax remove debug output 2012-10-08 17:32:04 +02:00
appinfo Merge branch 'master' into routing 2012-10-17 16:38:11 +02:00
css Whitespace cleanup 2012-10-14 21:04:08 +02:00
js Merge branch 'master' into routing 2012-10-17 16:38:11 +02:00
l10n [tx-robot] updated from transifex 2012-10-16 23:39:13 +02:00
templates Whitespace cleanup 2012-10-14 21:04:08 +02:00
admin.php Whitespace cleanup 2012-10-14 21:04:08 +02:00
download.php adding space between) and { 2012-09-07 15:22:01 +02:00
index.php Merge branch 'master' into routing 2012-09-07 15:51:44 +02:00
settings.php adding space between) and { 2012-09-07 15:22:01 +02:00