Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		2019-06-07 17:00:36 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-22 20:40:04 +02:00
flavours	Fix display of alt-text when a media attachment is not available	2019-06-07 16:39:07 +02:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-28 17:45:06 +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	2019-06-07 17:00:36 +02:00
packs	Animate avatar GIFs on-hover on public profiles (#10549)	2019-04-21 04:47:39 +02:00
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00