mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-15 07:34:58 +01:00
Code Issues Projects Releases Wiki Activity
c47be5bd86
mastodon/app/javascript/flavours
History
Thibaut Girka 9101254d0a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
2020-04-05 18:32:06 +02:00
..
glitch Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00
vanilla Fix settings/flavours 2019-03-16 16:21:20 +01:00