luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-19 16:39:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
2020-01-20 18:31:11 +01:00
..
core Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
flavours Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-01-12 15:57:34 +01:00