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

# Conflicts:
#   static/fontello.json
This commit is contained in:
Shpuld Shpludson 2020-05-08 08:20:03 +00:00
commit f4676e17d3
19 changed files with 605 additions and 89 deletions

View file

@ -351,6 +351,18 @@
"css": "share",
"code": 61920,
"src": "fontawesome"
},
{
"uid": "8b80d36d4ef43889db10bc1f0dc9a862",
"css": "user",
"code": 59428,
"src": "fontawesome"
},
{
"uid": "12f4ece88e46abd864e40b35e05b11cd",
"css": "ok",
"code": 59431,
"src": "fontawesome"
}
]
}