Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

core

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

2019-04-22 20:40:04 +02:00

flavours

Fix polls icon not showing in CW button in detailed statuses

2019-05-03 21:55:50 +02:00

fonts

…

images

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

2019-03-20 13:54:00 +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

2019-05-04 16:37:26 +02:00

packs

Animate avatar GIFs on-hover on public profiles (#10549)

2019-04-21 04:47:39 +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

2019-05-04 16:37:26 +02:00