luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-11 07:55:04 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
flavours Add a local setting for inline preview cards 2018-10-30 17:51:06 +01:00
fonts
images Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 17:52:08 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 11:22:25 +01:00