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 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml		6 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
stream_entries	Add animate custom emoji param to embed pages (#8507)	6 years ago