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

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

# Conflicts:
#	go.mod
#	go.sum
parents 54878ddb fea2826e
No related branches found
No related tags found
2 merge requests!67fix for latest client release,!61Add emoji sanitizater
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment