diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-05-08 08:20:03 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-05-08 08:20:03 +0000 |
| commit | f4676e17d3ec15f7c8bad776a7c7799f83f679b0 (patch) | |
| tree | 6d7a1ddb581a3879165828c059596847408638b3 /static | |
| parent | ddc3b86d24249021cc1634dbdfb476684265f293 (diff) | |
| parent | f40de85b92f55903da39c5c0f1b8db6ca7cb88f6 (diff) | |
Merge branch 'develop' into 'feature/copy-link'
# Conflicts:
# static/fontello.json
Diffstat (limited to 'static')
| -rwxr-xr-x | static/fontello.json | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/static/fontello.json b/static/fontello.json index 9e56232c..7f0e7cdd 100755 --- a/static/fontello.json +++ b/static/fontello.json @@ -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" } ] }
\ No newline at end of file |