From: Christian Heller Date: Wed, 14 Dec 2016 19:52:50 +0000 (+0100) Subject: Merge branch 'master' of http://github.com/plomlompom/config X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdb.prefix%7D%7D/static/condition?a=commitdiff_plain;h=fe7712ea200dee8b0ba5db3f26a974a248f0786c;p=config Merge branch 'master' of github.com/plomlompom/config --- fe7712ea200dee8b0ba5db3f26a974a248f0786c