Merge branch 'master' into uploader
Conflicts: php/modules/Session.php
This commit is contained in:
commit
cece57977f
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user