server/apps
Bart Visscher 66b1ad0a9b Merge branch 'master' into type-hinting-sharing
Conflicts:
	apps/files_sharing/lib/share/file.php
	apps/files_sharing/tests/api.php
	lib/private/share/share.php
2014-04-28 17:59:41 +02:00
..
files [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
files_encryption merge master into webdav-injection 2014-04-25 11:47:06 +02:00
files_external [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
files_sharing Merge branch 'master' into type-hinting-sharing 2014-04-28 17:59:41 +02:00
files_trashbin Merge pull request #8247 from owncloud/l10n-files_trasbin-fix 2014-04-22 11:34:49 +02:00
files_versions [tx-robot] updated from transifex 2014-04-19 01:56:06 -04:00
user_ldap [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
user_webdavauth [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00