Merge branch 'pull'

This commit is contained in:
Friendika 2011-11-07 17:26:49 -08:00
commit aeddfa1e0a

View File

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