djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-15 04:03:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/javascript
History
Thibaut Girka 45709d6987 Merge branch 'master' into glitch-soc/master 
Conflicts:
- `README.md`:
  We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `yarn.lock`:
  No real conflict, glitch-specific dependency too close to
  an updated one. Adapted upstream change.
2020-01-20 15:00:22 +01:00
..
core
Merge branch 'master' into glitch-soc/master
2019-12-19 13:52:54 +01:00
flavours
[Glitch] Correct margins for heading actions
2020-01-12 16:05:09 +01:00
fonts
…
images
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-10 18:59:53 +02:00
locales
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-01 21:00:16 +01:00
mastodon
Merge branch 'master' into glitch-soc/master
2020-01-20 15:00:22 +01:00
packs
Admin setting to disable default follows (#12566)
2019-12-16 23:55:50 +01:00
skins
Port Sylvhem's mastodon-light to glitch flavour
2018-05-07 17:00:02 +02:00
styles
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-12 15:57:34 +01:00