diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-07-14 11:44:06 +0300 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-07-14 11:44:06 +0300 |
| commit | cac1418affbc0ae91bce2a4d4c14046e73484116 (patch) | |
| tree | b8a9ef91853d7f4d3f35e632e0b3e71b5dd79c7d /static | |
| parent | 78ec84477e978a654ecfd482157dbf04a69f32e2 (diff) | |
| parent | 3e09a708f600b47dde831eeddb412828b38a0cf4 (diff) | |
fix merge conflicts
Diffstat (limited to 'static')
| -rw-r--r-- | static/fontello.json | 6 | ||||
| -rw-r--r-- | static/terms-of-service.html | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/static/fontello.json b/static/fontello.json index 5ef8544e..706800cd 100644 --- a/static/fontello.json +++ b/static/fontello.json @@ -399,6 +399,12 @@ "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> |