From e80d69d25b816cda36e2c772db2805f2dc744bbe Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 11 Aug 2012 18:54:23 -0700
Subject: merge upstream

---
 boot.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 00acdf078..30d49539c 100644
--- a/boot.php
+++ b/boot.php
@@ -399,6 +399,8 @@ if(! class_exists('App')) {
 		public	$sourcename = '';
 		public	$videowidth = 425;
 		public	$videoheight = 350;
+		public	$force_max_items = 0;
+		public	$theme_thread_allow = true;
 
 		private $scheme;
 		private $hostname;
-- 
cgit v1.2.3