Merge branch 'pull'

This commit is contained in:
Friendika 2011-11-07 17:26:49 -08:00
commit aeddfa1e0a
1 changed files with 2 additions and 0 deletions

View File

@ -254,6 +254,8 @@ class App {
public $plugins; public $plugins;
public $apps = array(); public $apps = array();
public $identities; public $identities;
public $nav_sel;
private $scheme; private $scheme;
private $hostname; private $hostname;