fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-27 15:54:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/presenters
History
Claire 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/admin/dashboard_controller.rb`:
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.
- `app/views/admin/dashboard/index.html.haml`
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.
2021-10-14 21:44:57 +02:00
..
activitypub Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
account_relationships_presenter.rb Add user notes on accounts (#14148) 2020-06-30 19:19:50 +02:00
initial_state_presenter.rb Add visibility parameter in share page (#13023) 2020-06-09 00:16:30 +02:00
instance_presenter.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
status_relationships_presenter.rb Use Enumerable#filter_map in more places (#15527) 2021-01-22 16:28:15 +01:00