Merge branch 'main' into frogend-restructure

This commit is contained in:
f0x52 2022-06-08 21:12:48 +02:00 committed by GitHub
commit eec7e5573c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
144 changed files with 2556 additions and 1784 deletions

View file

@ -2,7 +2,17 @@
<main>
<section>
<h1>404: Page Not Found</h1>
If you believe this was an error, you can <a href="{{.instance.ContactAccount.URL}}">contact an admin</a>
<p>
GoToSocial only serves Public statuses via the web.
If you reached this page by clicking on a status link,
it's possible that the status is not Public, has been
deleted by the author, you don't have permission to see
it, or it just doesn't exist at all.
</p>
<p>
If you believe this 404 was an error, you can contact
the instance admin.
</p>
</section>
</main>

View file

@ -3,6 +3,5 @@
<section class="error">
<span>❌</span> <pre>{{.error}}</pre>
</section>
</main>
{{ template "footer.tmpl" .}}