luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-02 11:33:36 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
2019-08-07 13:56:48 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
flavours Implement keyboard navigation in glitch-soc composer 2019-08-06 16:36:18 +02: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 2019-08-07 13:56:48 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00