Merge remote-tracking branch 'origin/master' into nginx
authorMatteo Nastasi <nastasi@alternativeoutput.it>
Thu, 12 Jan 2017 06:23:23 +0000 (06:23 +0000)
committerMatteo Nastasi <nastasi@alternativeoutput.it>
Thu, 12 Jan 2017 06:23:23 +0000 (06:23 +0000)
commit302c97f7ac81dfcc6fc8d8d44359f4f432e4618a
tree8e90e8a71b8a15dfafa05c55973e9f3c7d5f8bcf
parent5866b9ff7c9cfb7a068becd863b14db733a31206
parent9c96c38b48ab376e202045407786dbcf553febb2
Merge remote-tracking branch 'origin/master' into nginx

Conflicts:
web/briskin5/index_wr.php
web/index_wr.php
INSTALL.sh
web/Obj/brisk.phh
web/Obj/dbase_pgsql.phh
web/Obj/sac-a-push.phh
web/Obj/user.phh
web/briskin5/Obj/briskin5.phh
web/commons.js
web/index.php
web/index_wr.php