From: Christian Heller Date: Sat, 13 Jun 2015 11:39:35 +0000 (+0200) Subject: Merge branch 'master' of github.com:plomlompom/config X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/cards/%7B%7Bcard_id%7D%7D/templates?a=commitdiff_plain;h=1acab9749bfbf49b2ecaf86d21eeeb20d2301f80;p=config Merge branch 'master' of github.com:plomlompom/config --- 1acab9749bfbf49b2ecaf86d21eeeb20d2301f80