UnionRoom
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/app/javascript
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
..
core Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
flavours [Glitch] Add single option votes tooltip in polls 2021-10-13 15:53:33 +02:00
fonts
…
images Merge branch 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
packs Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 20:44:59 +02:00
skins Glitchsoc translation to 'es' language (#1439) 2020-10-19 22:17:29 +02:00
styles Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00