mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-10-20 14:47:33 +02:00
3f60b096b5
Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version. |
||
---|---|---|
.. | ||
extend.rb | ||
scoped_settings.rb |