You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		6 years ago
..
core	…
flavours	Fix display of alt-text when a media attachment is not available	6 years ago
fonts	…
images	…
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
packs	…
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago