FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app
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
..
chewy
…
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
mailers Prepare Mastodon for Rails 6 (#15911) 2021-03-17 10:09:55 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2021-08-20 13:01:50 +02:00