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 6719b9daa5 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.		5 years ago
..
_custom_emoji.html.haml	Fix not showing if emoji has a local counterpart in admin UI (#12135)	5 years ago
index.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
new.html.haml	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago