Commit cece5797 authored by Tobias Reich's avatar Tobias Reich
Browse files

Merge branch 'master' into uploader

Conflicts:
	php/modules/Session.php
parents 917b7649 c4798ce1
...@@ -63,6 +63,7 @@ class Session extends Module { ...@@ -63,6 +63,7 @@ class Session extends Module {
unset($return['config']['dropboxKey']); unset($return['config']['dropboxKey']);
unset($return['config']['login']); unset($return['config']['login']);
unset($return['config']['location']); unset($return['config']['location']);
unset($return['config']['plugins']);
# Logged out # Logged out
$return['loggedIn'] = false; $return['loggedIn'] = false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment