masto-fe/app/javascript
Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.
2020-01-04 23:04:42 +01:00
..
core Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
flavours [Glitch] Fix manual scrolling issue on Firefox/Windows 2019-12-19 14:43:47 +01:00
fonts Theme: Windows 95 2018-01-05 16:22:58 -08:00
images Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
packs Admin setting to disable default follows (#12566) 2019-12-16 23:55:50 +01: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 2020-01-04 23:04:42 +01:00