jknockaert 417e40d218 Merge remote-tracking branch 'origin/master' ... Conflicts: apps/files_encryption/lib/stream.php		2015-02-19 16:08:33 +01:00
..
files	Merge pull request #12895 from owncloud/favorites-polish	2014-12-17 13:42:20 +01:00
files_encryption	Merge remote-tracking branch 'origin/master'	2015-02-19 16:08:33 +01:00
files_external	[tx-robot] updated from transifex	2014-12-17 01:56:41 -05:00
files_sharing	[tx-robot] updated from transifex	2014-12-17 01:56:41 -05:00
files_trashbin	[tx-robot] updated from transifex	2014-12-17 01:56:41 -05:00
files_versions	reduce OC_Preferences, OC_Config and \OCP\Config usage	2014-12-08 22:42:37 +01:00
user_ldap	[tx-robot] updated from transifex	2014-12-17 01:56:41 -05:00
user_webdavauth	[tx-robot] updated from transifex	2014-12-17 01:56:41 -05:00