mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-28 12:59:39 +00:00
9765d2b3f8
Conflicts: - `config/environments/production.rb`: Upstream changed headers, and we have different ones. Ported upstream's change. |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |