Merge remote-tracking branch 'origin/together-for-fun' into nginx
authorMatteo Nastasi <nastasi@alternativeoutput.it>
Sun, 9 Jul 2017 17:02:31 +0000 (19:02 +0200)
committerMatteo Nastasi <nastasi@alternativeoutput.it>
Sun, 9 Jul 2017 17:02:31 +0000 (19:02 +0200)
commitc0cc54c9494acf8f43b92a0517d32d38b5006aa0
treebad8bb093112146c886fcee4c27b3cb4bd16ba31
parent302c97f7ac81dfcc6fc8d8d44359f4f432e4618a
parent0c03cc562401d8eae266433472ab26d32fefaf04
Merge remote-tracking branch 'origin/together-for-fun' into nginx

Conflicts:
web/briskin5/Obj/briskin5.phh
web/briskin5/index_wr.php
web/briskin5/stat-day.php
web/briskin5/statadm.php
INSTALL.sh
web/Obj/brisk.phh
web/Obj/dbase_pgsql.phh
web/Obj/user.phh
web/briskin5/Obj/briskin5.phh
web/briskin5/index.php
web/briskin5/index_wr.php
web/index.php