aboutsummaryrefslogtreecommitdiffstats
path: root/htconfig.php
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-03 08:05:53 -0500
committerSimon L'nu <simon.lnu@gmail.com>2012-03-03 08:05:53 -0500
commitba284044707e0f66fed98c711b9262bd623a0d42 (patch)
tree8f9bfbf8047d65ef8691b9353d1124aeed765129 /htconfig.php
parent7ef861907e32cd3d01877c0fdf8e2544f4f659b1 (diff)
parent8ffe15fbb1290fac839189f2de337efec223c5e1 (diff)
downloadvolse-hubzilla-ba284044707e0f66fed98c711b9262bd623a0d42.tar.gz
volse-hubzilla-ba284044707e0f66fed98c711b9262bd623a0d42.tar.bz2
volse-hubzilla-ba284044707e0f66fed98c711b9262bd623a0d42.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: fix text-editor in theme german strings as of 28th Feb from transilex small fix in style.css fix star/unstar fixes in wall_item.tpl and style.css in theme diabook fix in wall_item.tpl new icon link.png add diabook to default themes fixed broken tags and notifications in theme * master:
Diffstat (limited to 'htconfig.php')
-rwxr-xr-xhtconfig.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/htconfig.php b/htconfig.php
index 01f56f2c4..423d5d369 100755
--- a/htconfig.php
+++ b/htconfig.php
@@ -69,7 +69,7 @@ $a->config['system']['rino_encrypt'] = true;
// allowed themes (change this from admin panel after installation)
-$a->config['system']['allowed_themes'] = 'dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr';
+$a->config['system']['allowed_themes'] = 'dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr,diabook';
// default system theme