mirror of https://github.com/Siphonay/mastodon
ac2370778a
Conflicts: - `config/environments/production.rb`: Upstream enforced a code style change and glitch-soc had a few different lines. Applied upstream's code style to glitch-soc's changes. |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |