therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 'chore/improve-default-tos'

Browse source 
# Conflicts:
#   static/terms-of-service.html
This commit is contained in:
lain 2020-06-12 14:17:56 +00:00
commit fd109fa355
312 changed files with 15287 additions and 9954 deletions
Download patch file Download diff file Expand all files Collapse all files

5
static/terms-of-service.html
View file

@ -1,8 +1,9 @@
<h4>Terms of Service</h4>
<p>This is the default placeholder ToS. You should change it to fit the needs of your instance.</p>
<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
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>
<img src="/static/logo.png" style="display: block; margin: auto;">
<img src="/static/logo.png" style="display: block; margin: auto; max-width: 100%; height: 50px; object-fit: contain;" />