diff options
| author | Marie <marie@kaifa.ch> | 2024-02-19 19:06:30 +0000 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-02-19 19:06:30 +0000 |
| commit | e248e412872dc76ec13f4e0258f4af91dc09cafa (patch) | |
| tree | b7a7ef817b62215352cf895aad87c758af833008 /packages/backend/src/server/web/views/error.pug | |
| parent | rename to get it applied after upstream changes (diff) | |
| parent | merge: Merge upstream from 19th Feburary (!428) (diff) | |
| download | sharkey-e248e412872dc76ec13f4e0258f4af91dc09cafa.tar.gz sharkey-e248e412872dc76ec13f4e0258f4af91dc09cafa.tar.bz2 sharkey-e248e412872dc76ec13f4e0258f4af91dc09cafa.zip | |
fix: merge conflict
Diffstat (limited to 'packages/backend/src/server/web/views/error.pug')
| -rw-r--r-- | packages/backend/src/server/web/views/error.pug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/backend/src/server/web/views/error.pug b/packages/backend/src/server/web/views/error.pug index 00a2a72d7a..39b75abc4c 100644 --- a/packages/backend/src/server/web/views/error.pug +++ b/packages/backend/src/server/web/views/error.pug @@ -13,7 +13,7 @@ doctype html Thank you for using Sharkey! If you are reading this message... how about joining the development? - https://git.joinsharkey.org/Sharkey/Sharkey + https://activitypub.software/TransFem-org/Sharkey html |