Skip to content
Snippets Groups Projects
Commit 61d14e1f authored by Angelina Filippova's avatar Angelina Filippova
Browse files

Merge branch 'master' into 'feature/update-and-move-emoji-packs'

# Conflicts:
#   src/utils/request.js
parents 7afb327a 93f3fca7
No related branches found
No related tags found
1 merge request!54Redesign emoji packs and move it to settings
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment