Merge branch 'master' into uploader

Conflicts: php/modules/Session.php
10 years ago · cece57977f
parent 917b764946 c4798ce16f
commit cece57977f
1 changed files with 1 additions and 0 deletions
--- a/php/modules/Session.php
+++ b/php/modules/Session.php
@ -63,6 +63,7 @@ class Session extends Module {
 			unset($return['config']['dropboxKey']);
 			unset($return['config']['login']);
 			unset($return['config']['location']);
+			unset($return['config']['plugins']);

 			# Logged out
 			$return['loggedIn'] = false;