Skip to content
Snippets Groups Projects
Commit 3b5bd0f1 authored by Jono Wenger's avatar Jono Wenger
Browse files

Merge remote-tracking branch 'origin/release' into XX-4431/Emoji

# Conflicts:
#	.gitlab-ci.yml
parents c9744461 d1827858
No related branches found
No related tags found
2 merge requests!67fix for latest client release,!61Add emoji sanitizater
Showing
with 1805 additions and 257 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment