masto-fe/app/javascript
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
flavours Fix composer not getting focus after reply confirmation dialog 2018-12-21 20:00:49 +01:00
fonts Theme: Windows 95 2018-01-05 16:22:58 -08:00
images Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01: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 2018-12-23 11:28:28 +01:00
packs Escape HTML in profile name preview in profile settings (#9446) 2018-12-07 16:42:22 +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 2018-12-23 11:28:28 +01:00