luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-15 22:49:44 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 59e92004b3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency
2020-06-17 17:10:15 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
flavours [Glitch] Fix WebUI crash when loading account data before page is loaded 2020-06-09 11:55:07 +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 'master' into glitch-soc/merge-upstream 2020-06-17 17:10:15 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-06-17 17:10:15 +02:00