From: Benjamin Auder <benjamin.auder@somewhere>
Date: Thu, 23 Mar 2017 13:30:48 +0000 (+0100)
Subject: Merge branch 'master' of auder.net:cgds
X-Git-Url: https://git.auder.net/game/current/%7B%7B%20asset%28%27mixstore/css/static/%7B%7B%20pkg.url%20%7D%7D?a=commitdiff_plain;h=e49c086220aa729c1d9effd3f592422f292bd426;p=cgds.git

Merge branch 'master' of auder.net:cgds
---

e49c086220aa729c1d9effd3f592422f292bd426