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 aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
2019-06-26 23:19:22 +02:00
..
core Include necessary JS in auth pages 2019-06-13 22:38:22 +02:00
flavours Scroll to compose form rather than reply indicator on focus 2019-06-26 10:46:11 +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-06-26 23:19:22 +02:00
packs Put poll options behind content warnings (#10983) 2019-06-08 17:40:59 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00