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		2018-08-31 19:10:57 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
stream_entries	Add animate custom emoji param to embed pages (#8507)	2018-08-30 23:14:01 +02:00