Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
3f60b096b51b000905290d69ea05b874b60fa9e0
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
Refactor Setting (#3302)
2017-05-25 14:14:36 +02:00
scoped_settings.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-15 15:32:40 +02:00