Thomas Müller 3564a837d8 Merge pull request #19521 from owncloud/files-conflictdialog-loadpromise ... Make sure the conflict dialog is loaded before adding conflicts		2015-10-02 12:15:44 +02:00
..
encryption	[tx-robot] updated from transifex	2015-09-28 05:07:18 -04:00
files	Merge pull request #19521 from owncloud/files-conflictdialog-loadpromise	2015-10-02 12:15:44 +02:00
files_external	[tx-robot] updated from transifex	2015-10-02 01:54:51 -04:00
files_sharing	Merge pull request #19522 from owncloud/activity-395-less-sidebar-text	2015-10-02 12:13:53 +02:00
files_trashbin	display checkboxes properly after file restore	2015-10-01 22:54:36 +02:00
files_versions	Hide sidebar tab headers conditionally	2015-09-28 14:57:44 +02:00
provisioning_api	Add proper PHPDoc	2015-09-08 14:02:30 +02:00
user_ldap	[tx-robot] updated from transifex	2015-10-02 01:54:51 -04:00