Björn Schießle 4c980a4851 Merge branch 'master' into update-expire-function ... Conflicts: apps/files_trashbin/appinfo/version apps/files_trashbin/lib/trash.php		2013-02-25 14:26:59 +01:00
..
files	Merge pull request #1832 from owncloud/fix_1779	2013-02-25 04:35:34 -08:00
files_encryption	[tx-robot] updated from transifex	2013-02-21 00:15:58 +01:00
files_external	Set required owncloud version to 4.93	2013-02-24 17:38:36 +01:00
files_sharing	Merge pull request #1856 from owncloud/fix_error_handling_stream_copy	2013-02-25 02:04:12 -08:00
files_trashbin	Merge branch 'master' into update-expire-function	2013-02-25 14:26:59 +01:00
files_versions	Merge branch 'master' into update-expire-function	2013-02-25 14:26:59 +01:00
user_ldap	Merge pull request #1882 from owncloud/required_version	2013-02-25 00:37:22 -08:00
user_webdavauth	Set required owncloud version to 4.93	2013-02-24 17:38:36 +01:00