diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-09-07 09:47:17 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-09-07 09:47:17 +0300 |
| commit | fa2b680855c790ba8ed8d7cc0dbf2a3a2e1dbaf6 (patch) | |
| tree | b2868a1c0d2fce025134af4167c824fc8ee49068 /static | |
| parent | 12519a54b55140a3e5f76e67ac53914654c2a8b0 (diff) | |
| parent | a73b09c73202117ffa3fecf7a9185981d6696912 (diff) | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
Diffstat (limited to 'static')
| -rw-r--r--[-rwxr-xr-x] | static/fontello.json | 30 | ||||
| -rw-r--r-- | static/terms-of-service.html | 2 |
2 files changed, 31 insertions, 1 deletions
diff --git a/static/fontello.json b/static/fontello.json index ac3f0a18..706800cd 100755..100644 --- a/static/fontello.json +++ b/static/fontello.json @@ -375,6 +375,36 @@ "css": "download", "code": 59429, "src": "fontawesome" + }, + { + "uid": "f04a5d24e9e659145b966739c4fde82a", + "css": "bookmark", + "code": 59430, + "src": "fontawesome" + }, + { + "uid": "2f5ef6f6b7aaebc56458ab4e865beff5", + "css": "bookmark-empty", + "code": 61591, + "src": "fontawesome" + }, + { + "uid": "9ea0a737ccc45d6c510dcbae56058849", + "css": "music", + "code": 59432, + "src": "fontawesome" + }, + { + "uid": "1b5a5d7b7e3c71437f5a26befdd045ed", + "css": "doc", + "code": 59433, + "src": "fontawesome" + }, + { + "uid": "98d9c83c1ee7c2c25af784b518c522c5", + "css": "block", + "code": 59434, + "src": "fontawesome" } ] }
\ No newline at end of file diff --git a/static/terms-of-service.html b/static/terms-of-service.html index b2c66815..3b6bbb36 100644 --- a/static/terms-of-service.html +++ b/static/terms-of-service.html @@ -2,7 +2,7 @@ <p>This is the default placeholder ToS. You should copy it over to your static folder and edit it to fit the needs of your instance.</p> -<p>To do so, place a file at <code>"/instance/static/terms-of-service.html"</code> in your +<p>To do so, place a file at <code>"/instance/static/static/terms-of-service.html"</code> in your Pleroma install containing the real ToS for your instance.</p> <p>See the <a href='https://docs.pleroma.social/backend/configuration/static_dir/'>Pleroma documentation</a> for more information.</p> <br> |