aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2014-02-06 23:11:47 +0100
committermarijus <mario@localhost.localdomain>2014-02-06 23:11:47 +0100
commit6f2c168d1a434b2223f09a922780617fdc07b278 (patch)
tree0e715f778ccda1260176a7c4db60494670eb3f55 /view
parenta2b311991a90e1c78d30bad5504c18bb2a3c5c2a (diff)
parent3e677ec53de7517c249114dd30539141fbde85e3 (diff)
downloadvolse-hubzilla-6f2c168d1a434b2223f09a922780617fdc07b278.tar.gz
volse-hubzilla-6f2c168d1a434b2223f09a922780617fdc07b278.tar.bz2
volse-hubzilla-6f2c168d1a434b2223f09a922780617fdc07b278.zip
Merge branch 'master' of https://github.com/friendica/red into upstream
Diffstat (limited to 'view')
-rw-r--r--view/en/htconfig.tpl3
1 files changed, 2 insertions, 1 deletions
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 28fdd04f0..840e7a124 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -65,12 +65,13 @@ $a->config['system']['access_policy'] = ACCESS_PRIVATE;
$a->config['system']['sellpage'] = '';
// Maximum size of an imported message, 0 is unlimited
+// FIXME - NOT currently implemented.
$a->config['system']['max_import_size'] = 200000;
// maximum size of uploaded photos
-$a->config['system']['maximagesize'] = 3000000;
+$a->config['system']['maximagesize'] = 12000000;
// Location of PHP command line processor