tootlab-mastodon/app/javascript
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 Theme: Windows 95 2018-01-05 16:22:58 -08:00
images Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
locales Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
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 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 2018-10-30 11:22:25 +01:00