luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-02 19:44:12 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/presenters
History
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
..
activitypub
account_relationships_presenter.rb
initial_state_presenter.rb
instance_presenter.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
status_relationships_presenter.rb