Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2017-05-03 17:46:51 -07:00
parent 4933aef543 d6a3f7765a
commit c0edfee224
5 changed files with 296 additions and 32 deletions
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -110,7 +110,7 @@ technical abilities.
    php.ini file - and with no hosting provider restrictions on the use of 
    exec() and proc_open().

-    - curl, gd (with at least jpeg and png support), mysqli, mbstring, xml,
+    - curl, gd (with at least jpeg and png support), mysqli, mbstring, xml, zip
    and openssl extensions. The imagick extension MAY be used instead of gd,
 	but is not required and MAY also be disabled via configuration option.