Sam Tuke 31e723a907 Merge github.com:owncloud/core ...

Conflicts:
	lib/public/share.php

2013-01-31 16:30:37 +00:00

..

binary

All in-use unit tests now passing after merge

2013-01-06 18:38:35 +00:00

crypt.php

Merge github.com:owncloud/core

2013-01-31 16:30:37 +00:00

keymanager.php

Adding sharing support: added new method in Keymanager setShareKey()

2013-01-14 19:07:28 +00:00

legacy-encrypted-text.txt

All in-use unit tests now passing after merge

2013-01-06 18:38:35 +00:00

proxy.php

drop SimpleTest compatibility

2013-01-24 16:47:17 +01:00

stream.php

drop SimpleTest compatibility

2013-01-24 16:47:17 +01:00

util.php

Merge github.com:owncloud/core

2013-01-31 16:30:37 +00:00

zeros

All in-use unit tests now passing after merge

2013-01-06 18:38:35 +00:00