nextcloud/apps
Bjoern Schiessle f8563ec583 Merge branch 'master' into sharing_mail_notification_master
increased version number to trigger db update

Conflicts:
	lib/util.php
2013-09-05 13:39:45 +02:00
..
files Merge branch 'master' into sharing_mail_notification_master 2013-09-05 13:39:45 +02:00
files_encryption [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
files_external Merge pull request #4489 from owncloud/clean-3rdparty-mess-master 2013-08-28 06:12:58 -07:00
files_sharing [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
files_trashbin [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
files_versions [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
user_ldap [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
user_webdavauth [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00