Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml

2019-04-01 21:28:31 +02:00

..

core

Fix CW fold/unfold in remote interaction dialog

2019-02-17 15:40:49 +01:00

flavours

[Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile

2019-03-30 18:19:40 +01:00

fonts

…

images

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-20 13:54:00 +01:00

locales

…

mastodon

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-01 21:28:31 +02:00

packs

Merge branch 'master' into glitch-soc/merge-upstream

2019-02-17 12:26:55 +01:00

skins

…

styles

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-01 21:28:31 +02:00