summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/web/views
diff options
context:
space:
mode:
authorKaity A <kaity@atikayda.au>2024-02-24 05:05:25 +0000
committerKaity A <kaity@atikayda.au>2024-02-24 05:05:25 +0000
commitdef2e8dff03da399e68045eec02dddc9d1781a0a (patch)
tree6246b4898fb88d045c09accaf51d6a60b554d80e /packages/backend/src/server/web/views
parentfix: delete old follow request (if exists) before creating new (diff)
parentmerge: Reactions not working on child notes in detailed view (!438) (diff)
downloadsharkey-def2e8dff03da399e68045eec02dddc9d1781a0a.tar.gz
sharkey-def2e8dff03da399e68045eec02dddc9d1781a0a.tar.bz2
sharkey-def2e8dff03da399e68045eec02dddc9d1781a0a.zip
Merge remote-tracking branch 'origin/develop' into fix/failed-follow
Diffstat (limited to 'packages/backend/src/server/web/views')
-rw-r--r--packages/backend/src/server/web/views/base.pug2
-rw-r--r--packages/backend/src/server/web/views/error.pug2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index c15e123a15..5fda2ee9ee 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -18,7 +18,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
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