projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
priv
/
static
/
static
/
font
/
config.json
diff --git
a/priv/static/static/font/config.json
b/priv/static/static/font/config.json
index 72a48a74fc1966fc979e5e865670c88e04d59711..c0cf1727192f4209953bf5039fc29b8090948018 100755
(executable)
--- a/
priv/static/static/font/config.json
+++ b/
priv/static/static/font/config.json
@@
-240,6
+240,12
@@
"code": 59419,
"src": "fontawesome"
},
"code": 59419,
"src": "fontawesome"
},
+ {
+ "uid": "d862a10e1448589215be19702f98f2c1",
+ "css": "smile",
+ "code": 61720,
+ "src": "fontawesome"
+ },
{
"uid": "671f29fa10dda08074a4c6a341bb4f39",
"css": "bell-alt",
{
"uid": "671f29fa10dda08074a4c6a341bb4f39",
"css": "bell-alt",
@@
-291,6
+297,12
@@
"css": "zoom-in",
"code": 59420,
"src": "fontawesome"
"css": "zoom-in",
"code": 59420,
"src": "fontawesome"
+ },
+ {
+ "uid": "0bda4bc779d4c32623dec2e43bd67ee8",
+ "css": "gauge",
+ "code": 61668,
+ "src": "fontawesome"
}
]
}
\ No newline at end of file
}
]
}
\ No newline at end of file