Merge branch 'master' into uploader

Conflicts:
	php/modules/Session.php
This commit is contained in:
Tobias Reich 2014-08-01 17:01:59 +02:00
commit cece57977f

View File

@ -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;