Bjoern Schiessle e5c84488ff Merge branch 'files_encryption' of gitorious.org:owncloud/owncloud into files_encryption ... Conflicts: apps/files_encryption/lib/keymanager.php		2012-07-26 14:06:39 +02:00
..
appinfo	Mainly work on implementing new encryption system (+ keyfile handling) into proxy classs	2012-07-25 18:28:56 +01:00
hooks	Mainly work on implementing new encryption system (+ keyfile handling) into proxy classs	2012-07-25 18:28:56 +01:00
js	fixed typos	2012-07-10 15:51:57 +01:00
lib	Merge branch 'files_encryption' of gitorious.org:owncloud/owncloud into files_encryption	2012-07-26 14:06:39 +02:00
templates	fixed typos	2012-07-10 15:51:57 +01:00
tests	added tests and methods relating to handling of legacy keys	2012-07-25 12:38:40 +01:00
settings.php	removing executable bit - again	2012-05-15 00:52:00 +02:00