Thomas Müller 232518ac54 Merge pull request #15234 from owncloud/encryption2_core ... core part of encryption 2.0		2015-03-26 21:14:59 +01:00
..
l10n	[tx-robot] updated from transifex	2015-03-26 01:55:29 -04:00
private	Merge pull request #15234 from owncloud/encryption2_core	2015-03-26 21:14:59 +01:00
public	Merge pull request #15234 from owncloud/encryption2_core	2015-03-26 21:14:59 +01:00
repair	Merge pull request #14665 from owncloud/fileid-increment	2015-03-26 19:36:18 +01:00
autoloader.php	Update license headers	2015-03-26 11:44:36 +01:00
base.php	Merge pull request #15234 from owncloud/encryption2_core	2015-03-26 21:14:59 +01:00