Skip to content
Snippets Groups Projects
Commit 215662af authored by HJ's avatar HJ :fire:
Browse files

Merge branch 'develop' into 'fix-move-type-notification'

# Conflicts:
#   static/fontello.json
parents c3e7806a 1a82a00a
No related branches found
No related tags found
No related merge requests found
Showing
with 104 additions and 61 deletions
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