From: Eugen <eugen@zeonfederated.com>
Date: Tue, 17 Jan 2017 17:46:53 +0000 (+0100)
Subject: Merge pull request #489 from ineffyble/master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d7a7baa9a7f6b44a3c0b7232e909e456c9231543;p=mastodon.git

Merge pull request #489 from ineffyble/master

Add Heroku deployment support
---

d7a7baa9a7f6b44a3c0b7232e909e456c9231543