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

Conflicts: view/wall_thread.tpl
2012-08-11 15:42:48 -07:00
parent 1cd23860cb 3039ad7aa7
commit 6348634a1b
46 changed files with 600 additions and 100 deletions
@@ -365,6 +365,7 @@ if(! class_exists('App')) {
 		public	$videowidth = 425;
 		public	$videoheight = 350;
 		public	$force_max_items = 0;
+		public	$theme_thread_allow = true;

 		private $scheme;
 		private $hostname;