Skip to content
Snippets Groups Projects
Commit f4676e17 authored by Shpuld Shpludson's avatar Shpuld Shpludson
Browse files

Merge branch 'develop' into 'feature/copy-link'

# Conflicts:
#   static/fontello.json
parents ddc3b86d f40de85b
No related branches found
No related tags found
No related merge requests found
Showing
with 602 additions and 86 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