Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches ...

Conflicts:
	lib/private/migration/content.php

2014-02-18 18:31:33 +01:00

..

binary

rename folder to tests

2013-04-30 00:34:05 +02:00

crypt.php

polish documentation based on scrutinizer patches

2014-02-06 17:02:21 +01:00

encryption.key

added users for tests

2013-05-26 20:44:15 +02:00

helper.php

tests added

2013-12-19 19:43:57 +01:00

hooks.php

fileinfo is no longer a array

2014-02-14 18:05:59 +01:00

keymanager.php

polish documentation based on scrutinizer patches

2014-02-06 17:02:21 +01:00

legacy-encrypted-text.txt

added users for tests

2013-05-26 20:44:15 +02:00

proxy.php

added tests for the delete hooks if the trash bin is disabled

2014-02-01 20:08:23 +01:00

share.php

Merge pull request #7190 from owncloud/appconfig-legacy-apps

2014-02-18 18:10:22 +01:00

stream.php

Replaced time() with uniqid() to make sure the file name is unique

2014-01-21 16:31:58 +01:00

trashbin.php

Replaced time() with uniqid() to make sure the file name is unique

2014-01-21 16:31:58 +01:00

util.php

Merge branch 'master' into scrutinizer_documentation_patches

2014-02-18 18:31:33 +01:00

webdav.php

Replaced time() with uniqid() to make sure the file name is unique

2014-01-21 16:31:58 +01:00

zeros

rename folder to tests

2013-04-30 00:34:05 +02:00