nextcloud/apps/files_encryption
Sam Tuke b95bc663af Merge branch 'master' into files_encryption-style-fixes
Conflicts:
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/util.php
2013-02-09 11:52:11 +00:00
..
ajax all unit files_encryption crypt unit tests now passing after merge 2012-10-17 16:35:19 +01:00
appinfo Removed debugging code 2013-02-06 17:59:47 +00:00
hooks Removed debugging code 2013-02-06 17:59:47 +00:00
js Add missing ; to js code 2012-09-05 22:26:09 +02:00
l10n [tx-robot] updated from transifex 2013-02-09 00:14:08 +01:00
lib Merge branch 'master' into files_encryption-style-fixes 2013-02-09 11:52:11 +00:00
templates Added missing translation wrapping 2013-02-05 17:22:59 +00:00
test Merge github.com:owncloud/core 2013-01-31 16:30:37 +00:00
settings-personal.php Added notice to personal settings indicating what filetypes are not encrypted 2013-02-05 17:06:15 +00:00
settings.php Re-added 'checkAdminUser' 2013-01-10 18:04:52 +00:00