From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Sat, 11 Apr 2020 07:23:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into wr-on-ws
X-Git-Tag: v5.8.0~8
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=fd768d2202b7705f9fe62c0a46c0822539bf4a68;p=brisk.git

Merge remote-tracking branch 'origin/master' into wr-on-ws

Conflicts:
	web/Obj/brisk.phh
---

fd768d2202b7705f9fe62c0a46c0822539bf4a68