diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-01-03 09:05:48 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-01-03 09:05:48 +0000 |
| commit | 215662afdee3935f66e5fbd73260e2039f5216de (patch) | |
| tree | 817b578e53b884c4b5facd63c166b522f59a8978 /static | |
| parent | c3e7806acbd32483eab497a347f947158ab8febf (diff) | |
| parent | 1a82a00a2b45041c35b72ab16ee34c120341b652 (diff) | |
Merge branch 'develop' into 'fix-move-type-notification'
# Conflicts:
# static/fontello.json
Diffstat (limited to 'static')
| -rwxr-xr-x | static/fontello.json | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/static/fontello.json b/static/fontello.json index 642381a1..829241b5 100755 --- a/static/fontello.json +++ b/static/fontello.json @@ -305,9 +305,39 @@ "src": "fontawesome" }, { + "uid": "31972e4e9d080eaa796290349ae6c1fd", + "css": "users", + "code": 59421, + "src": "fontawesome" + }, + { + "uid": "e82cedfa1d5f15b00c5a81c9bd731ea2", + "css": "info-circled", + "code": 59423, + "src": "fontawesome" + }, + { + "uid": "w3nzesrlbezu6f30q7ytyq919p6gdlb6", + "css": "home-2", + "code": 59425, + "src": "typicons" + }, + { + "uid": "dcedf50ab1ede3283d7a6c70e2fe32f3", + "css": "chat", + "code": 59422, + "src": "fontawesome" + }, + { + "uid": "3a00327e61b997b58518bd43ed83c3df", + "css": "login", + "code": 59424, + "src": "fontawesome" + }, + { "uid": "f3ebd6751c15a280af5cc5f4a764187d", "css": "arrow-curved", - "code": 59421, + "code": 59426, "src": "iconic" } ] |