aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-08-11 18:54:23 -0700
committerfriendica <info@friendica.com>2012-08-11 18:54:23 -0700
commite80d69d25b816cda36e2c772db2805f2dc744bbe (patch)
tree1b5f9f40061639d41b22591ae29491964934dc05 /boot.php
parentcac2d408329c8ad0f2f7faed07c4615be12acdf5 (diff)
downloadvolse-hubzilla-e80d69d25b816cda36e2c772db2805f2dc744bbe.tar.gz
volse-hubzilla-e80d69d25b816cda36e2c772db2805f2dc744bbe.tar.bz2
volse-hubzilla-e80d69d25b816cda36e2c772db2805f2dc744bbe.zip
merge upstream
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php2
1 files changed, 2 insertions, 0 deletions
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;