]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into patch-1
authorDavid Huerta <huertanix@users.noreply.github.com>
Fri, 7 Apr 2017 23:46:07 +0000 (19:46 -0400)
committerGitHub <noreply@github.com>
Fri, 7 Apr 2017 23:46:07 +0000 (19:46 -0400)
1  2 
docs/Running-Mastodon/Heroku-guide.md

Simple merge