luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-29 16:16:44 +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
flavours
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
packs
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 2019-03-20 13:54:00 +01:00