From: js6pak <kubastaron@hotmail.com>
Date: Mon, 12 Oct 2020 19:32:32 +0000 (+0200)
Subject: Merge branch 'fix/proton' of github.com:js6pak/Impostor into dev
X-Git-Tag: v1.2.2~113^2~25^2~2
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=eb40fdfd66c276af4b558606ece7d640a754cef0;p=rhonda%2Fimpostor.git

Merge branch 'fix/proton' of github.com:js6pak/Impostor into dev
---

eb40fdfd66c276af4b558606ece7d640a754cef0