fix 0.7.x 0.8.x merge conflict in register.php

[quix0rs-gnu-social.git] / doc-src / help

diff --git a/doc-src/help b/doc-src/help
index a8cfccd2b368132486a0439828ca1996a72d44f0..02cf0d14b0c1247f6db38ee9b72239ee7a2a608d 100644 (file)
--- a/doc-src/help
+++ b/doc-src/help
@@ -30,3 +30,5 @@ Here are some documents that you might find helpful in understanding
 * [OpenMicroBlogging](%%doc.openmublog%%) - subscribing to remote users
 * [Privacy](%%doc.privacy%%) - %%site.name%%'s privacy policy
 * [Source](%%doc.source%%) - How to get the Laconica source code
+* [Badge](%%doc.badge%%) - How to put a Laconica badge on your blog or homepage
+* [Bookmarklet](%%doc.bookmarklet%%) - Bookmarklet for posting Web pages
\ No newline at end of file