Merge branch 'together-for-fun' into nginx
authorMatteo Nastasi <nastasi@alternativeoutput.it>
Sun, 16 Jul 2017 15:44:27 +0000 (17:44 +0200)
committerMatteo Nastasi <nastasi@alternativeoutput.it>
Sun, 16 Jul 2017 15:44:27 +0000 (17:44 +0200)
1  2 
INSTALL.sh
web/Obj/brisk.phh
web/Obj/sac-a-push.phh
web/briskin5/index_wr.php
web/index_wr.php

diff --cc INSTALL.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge