summaryrefslogtreecommitdiff
path: root/doc/special_remotes.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-26 19:42:24 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-26 19:42:24 -0400
commit117df9c3714f2366d4f10d63fce41a608d96308e (patch)
tree47155e8948b3137cf2ee527afe2984899a3685eb /doc/special_remotes.mdwn
parentd2b9c300b12a025de66f39efafd7962dc591a330 (diff)
parent26fb68355b4ad95f99b2d14110e683109d0bab3d (diff)
Merge branch 'master' into xmpp
Conflicts: Assistant/Threads/NetWatcher.hs
Diffstat (limited to 'doc/special_remotes.mdwn')
-rw-r--r--doc/special_remotes.mdwn1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/special_remotes.mdwn b/doc/special_remotes.mdwn
index 2f6020461..65fcb8768 100644
--- a/doc/special_remotes.mdwn
+++ b/doc/special_remotes.mdwn
@@ -22,6 +22,7 @@ for various cloud things:
* [[tips/Internet_Archive_via_S3]]
* [[tahoe-lafs|forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs]]
* [[tips/using_box.com_as_a_special_remote]]
+* [[forum/special_remote_for_IMAP]]
## Unused content on special remotes