Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again ... Conflicts: apps/files_encryption/tests/keymanager.php		2013-08-17 13:15:22 +07:00
..
admin.js	Use !== and === in settings.	2013-07-21 13:55:25 +07:00
apps-custom.php	json_encode the appid	2013-02-09 15:06:35 +07:00
apps.js	draw attention to the newly added app entry by flashing it twice	2013-08-07 21:54:28 +07:00
isadmin.php	Move isadmin to external file	2013-01-21 21:25:38 +07:00
log.js	Use !== and === in settings.	2013-07-21 13:55:25 +07:00
personal.js	working decrypt files method	2013-07-29 17:06:05 +07:00
users.js	Use !== and === in settings.	2013-07-21 13:55:25 +07:00