0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-05 12:07:18 +00:00
mastodon/app/lib/settings
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb

Resolved by taking both changes (not a real conflict, just changes too close
to each other).
2018-11-27 13:23:02 +01:00
..
extend.rb
scoped_settings.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00