Lukas Reschke 2b493e2f9d Merge remote-tracking branch 'upstream/master' into master-sync-upstream		2016-06-21 11:18:22 +02:00
..
admin_audit	don't try to log the currently logged in user, this fails on cronjobs. The users are logged anyway	2016-06-20 11:21:27 +02:00
comments	[tx-robot] updated from transifex	2016-06-20 01:54:50 -04:00
dav	Merge remote-tracking branch 'upstream/master' into master-sync-upstream	2016-06-21 11:18:22 +02:00
encryption	Merge remote-tracking branch 'upstream/master' into master-sync-upstream	2016-06-21 11:18:22 +02:00
federatedfilesharing	Merge remote-tracking branch 'upstream/master' into master-sync-upstream	2016-06-21 11:18:22 +02:00
federation	Merge remote-tracking branch 'upstream/master' into master-sync-upstream	2016-06-21 11:18:22 +02:00
files	Merge remote-tracking branch 'upstream/master' into master-sync-upstream	2016-06-21 11:18:22 +02:00
files_external	Merge pull request #25173 from owncloud/fix_conversion_issues	2016-06-20 17:15:45 +02:00
files_sharing	Merge remote-tracking branch 'upstream/master' into master-sync-upstream	2016-06-21 11:18:22 +02:00
files_trashbin	no need to mention ownCloud explicitely	2016-06-20 14:46:13 +02:00
files_versions	no need to mention ownCloud explicitely	2016-06-20 14:46:13 +02:00
provisioning_api	Update license headers	2016-05-26 19:57:24 +02:00
systemtags	Don't send activity to non-admins when assigning invisible tags (#25192)	2016-06-20 22:06:34 +02:00
testing	[testing] Allow to lock a file without the lock being killed at the end of the request (#22823)	2016-05-30 11:16:14 +02:00
updatenotification	Merge remote-tracking branch 'upstream/master' into master-sync-upstream	2016-06-21 11:18:22 +02:00
user_ldap	Merge remote-tracking branch 'upstream/master' into master-sync-upstream	2016-06-21 11:18:22 +02:00