nextcloud/apps
Bart Visscher 5eba579827 Merge branch 'master' into routing
Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
2012-09-07 15:51:44 +02:00
..
files Merge branch 'master' into routing 2012-09-07 15:51:44 +02:00
files_encryption adding space between) and { 2012-09-07 15:22:01 +02:00
files_external adding space between) and { 2012-09-07 15:22:01 +02:00
files_sharing adding space between) and { 2012-09-07 15:22:01 +02:00
files_versions adding space between) and { 2012-09-07 15:22:01 +02:00
user_ldap adding space between) and { 2012-09-07 15:22:01 +02:00
user_webdavauth adding space between) and { 2012-09-07 15:22:01 +02:00
.gitkeep apps are now stored in /apps 2011-04-16 09:46:58 +02:00