luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-24 14:17:08 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/settings
History
Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
2019-08-07 13:56:48 +02:00
..
edit.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00