Merge https://github.com/friendica/friendica into pull

2012-08-04 17:03:32 -07:00
parent bf19e62ecd e27395b3d7
commit bc5b54d7b7
19 changed files with 57 additions and 39 deletions
--- a/boot.php
+++ b/boot.php
@@ -349,6 +349,7 @@ if(! class_exists('App')) {
 		public  $plugins;
 		public  $apps = array();
 		public  $identities;
+		public	$sourcename = '';
 	
 		public $nav_sel;