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 e9ad99bc93 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one.
2020-07-07 15:58:45 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-07-01 19:23:14 +02:00
flavours [Glitch] Add color extraction for audio thumbnails 2020-07-05 20:18:51 +02:00
fonts
images
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-07-07 15:58:45 +02:00
packs Fix lock icon not being shown when locking account in profile settings (#14190) 2020-07-01 13:51:50 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-07-07 15:58:45 +02:00