mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-29 11:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/views/admin/dashboard
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
..
index.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00