mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 23:24:55 +01:00
3f60b096b5
Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version. |
||
---|---|---|
.. | ||
development.rb | ||
production.rb | ||
test.rb |