From: Eugen <eugen@zeonfederated.com>
Date: Wed, 5 Apr 2017 08:23:32 +0000 (+0200)
Subject: Merge pull request #910 from krainboltgreene/master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6b02591fa3b08598a348512ccac47a1fb881a6a5;p=mastodon.git

Merge pull request #910 from krainboltgreene/master

Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0
---

6b02591fa3b08598a348512ccac47a1fb881a6a5