arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into uploader

Browse Source 
Conflicts:
	php/modules/Session.php
This commit is contained in:
Tobias Reich 2014-08-01 17:01:59 +02:00
commit cece57977f
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
php/modules/Session.php
View File

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