OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
mastodon/app/lib/settings
History
Thibaut Girka 3f60b096b5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.
 		2020-07-15 15:32:40 +02:00
..
extend.rb
…
scoped_settings.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-07-15 15:32:40 +02:00