luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-04 14:04:39 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/presenters
History
Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.
2019-03-14 17:17:20 +01:00
..
account_relationships_presenter_spec.rb
instance_presenter_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00