Thomas Müller 4441835d18 https://github.com/owncloud/core/pull/15305#discussion_r27382305 ... Conflicts: lib/private/files/stream/encryption.php		2015-04-07 13:30:28 +02:00
..
l10n	[tx-robot] updated from transifex	2015-04-07 01:54:47 -04:00
private	https://github.com/owncloud/core/pull/15305#discussion_r27382305	2015-04-07 13:30:28 +02:00
public	make recovery settings work	2015-04-07 13:30:28 +02:00
repair	Introducing media types for yml, yaml, cnf, conf	2015-04-02 21:37:57 +02:00
autoloader.php	Update license headers	2015-03-26 11:44:36 +01:00
base.php	fix lib/private/encryption/util.php call	2015-04-07 13:30:28 +02:00