Thomas Müller c77412b1ac Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-enabled ... disable the recovery key if the master key is enabled		2016-03-21 09:49:15 +01:00
..
appinfo	Increase all versions on master which is now 9.1	2016-03-02 08:53:42 +01:00
command	Happy new year!	2016-01-12 15:02:18 +01:00
controller	Happy new year!	2016-01-12 15:02:18 +01:00
css	improved admin settings	2015-05-08 11:41:38 +02:00
hooks	Remove Scrutinizer Auto Fixer	2016-03-01 17:48:23 +01:00
img
js	make encryption configurable for home storage	2015-10-27 14:24:20 +01:00
l10n	[tx-robot] updated from transifex	2016-03-12 01:55:36 -05:00
lib	Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally-untested-stuff	2016-03-16 21:56:36 +01:00
settings	disable the recovery key if the master key is enabled	2016-03-03 12:16:39 +01:00
templates	disable the recovery key if the master key is enabled	2016-03-03 12:16:39 +01:00
tests	allow group shares, even if not all public keys are available	2016-03-15 11:33:19 +01:00