luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-04 14:04:39 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
2019-03-20 13:54:00 +01:00
..
core Fix CW fold/unfold in remote interaction dialog 2019-02-17 15:40:49 +01:00
flavours [Glitch] Fix relationship manager on narrow screens 2019-03-18 18:07:03 +01:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +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 2019-03-20 13:54:00 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00