mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-12-08 13:29:18 +00:00
Conflicts: - `config/environments/production.rb`: Upstream changed headers, and we have different ones. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| development.rb | ||
| production.rb | ||
| test.rb | ||