From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Fri, 14 Sep 2018 08:51:30 +0000 (+0100)
Subject: Merge branch 'master' of git.friedersdorff.com:max/email_syndication
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=a421b07696fbf77b91f8743281040c3bc03155b4;p=max%2Femail_syndication.git

Merge branch 'master' of git.friedersdorff.com:max/email_syndication
---

a421b07696fbf77b91f8743281040c3bc03155b4