mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-31 06:21:50 +01:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka fdd0beefa7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.
2020-04-12 16:50:27 +02:00
..
core
Fix deprecated use of createBrowserHistory
2020-04-09 17:03:05 +02:00
flavours
Clean up some dead code
2020-04-10 14:47:06 +02:00
fonts
Theme: Windows 95
2018-01-05 16:22:58 -08:00
images
Merge branch 'master' into glitch-soc/merge-upstream
2020-01-24 14:37:06 +01: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/merge-upstream
2020-04-12 16:50:27 +02:00
packs
Merge branch 'master' into glitch-soc/merge-upstream
2020-04-05 18:32:06 +02: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-04-04 21:47:37 +02:00