diff options
| author | friendica <info@friendica.com> | 2014-06-17 17:36:58 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-06-17 17:36:58 -0700 |
| commit | 6c1304c00052da3b2861923f645d7c4de42bb796 (patch) | |
| tree | 36338fb5cd20be17a7a206287b85dbac967a5b0c | |
| parent | 5c8359f976d46a512c72f4946c03ba8adc81b919 (diff) | |
| parent | 105869c524f3f11f9338b831bcbef5ef616289b6 (diff) | |
| download | volse-hubzilla-6c1304c00052da3b2861923f645d7c4de42bb796.tar.gz volse-hubzilla-6c1304c00052da3b2861923f645d7c4de42bb796.tar.bz2 volse-hubzilla-6c1304c00052da3b2861923f645d7c4de42bb796.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | assets/hashlogo-lighttext.png | bin | 8541 -> 6370 bytes | |||
| -rw-r--r-- | assets/hashlogo.png | bin | 8536 -> 6362 bytes | |||
| -rw-r--r-- | images/rm-transparent-dark-background.png | bin | 8541 -> 6370 bytes | |||
| -rw-r--r-- | images/rm.png | bin | 8536 -> 6362 bytes | |||
| -rw-r--r-- | mod/admin.php | 1 |
5 files changed, 1 insertions, 0 deletions
diff --git a/assets/hashlogo-lighttext.png b/assets/hashlogo-lighttext.png Binary files differindex 20e48569f..7f94ccdd9 100644 --- a/assets/hashlogo-lighttext.png +++ b/assets/hashlogo-lighttext.png diff --git a/assets/hashlogo.png b/assets/hashlogo.png Binary files differindex 5d6cda25b..99ef21328 100644 --- a/assets/hashlogo.png +++ b/assets/hashlogo.png diff --git a/images/rm-transparent-dark-background.png b/images/rm-transparent-dark-background.png Binary files differindex 20e48569f..7f94ccdd9 100644 --- a/images/rm-transparent-dark-background.png +++ b/images/rm-transparent-dark-background.png diff --git a/images/rm.png b/images/rm.png Binary files differindex 5d6cda25b..99ef21328 100644 --- a/images/rm.png +++ b/images/rm.png diff --git a/mod/admin.php b/mod/admin.php index 74e2d8f56..37a147df6 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -255,6 +255,7 @@ function admin_page_site_post(&$a){ $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); $delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0); $poll_interval = ((x($_POST,'poll_interval'))? intval(trim($_POST['poll_interval'])) : 0); + $maxloadavg = ((x($_POST,'maxloadavg'))? intval(trim($_POST['maxloadavg'])) : 50); // $ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0); /* if($ssl_policy != intval(get_config('system','ssl_policy'))) { |
