aboutsummaryrefslogtreecommitdiffstats
path: root/doc/macros/addons_footer.bb
diff options
context:
space:
mode:
authorStefan Parviainen <saparvia@caterva.eu>2014-11-08 20:53:41 +0100
committerStefan Parviainen <saparvia@caterva.eu>2014-11-08 20:53:41 +0100
commitb5fad9feefd0f261807222d8a4c42ead6253a65c (patch)
tree399cd4a1b79f61530924ea59670af0bdd6cee5be /doc/macros/addons_footer.bb
parent89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff)
parentb29a968be8df52cd7c9b6d5bebb618534788337c (diff)
downloadvolse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz
volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2
volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip
Fix merge conflict
Diffstat (limited to 'doc/macros/addons_footer.bb')
-rw-r--r--doc/macros/addons_footer.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/macros/addons_footer.bb b/doc/macros/addons_footer.bb
index f6b687a23..32814c59b 100644
--- a/doc/macros/addons_footer.bb
+++ b/doc/macros/addons_footer.bb
@@ -1,2 +1,2 @@
Return to the [zrl=[baseurl]/help/addons]Addons documentation[/zrl]
-Return to the [zrl=[baseurl]/help/addons]Main documentation[/zrl]
+Return to the [zrl=[baseurl]/help/main]Main documentation[/zrl]