summaryrefslogtreecommitdiff
path: root/doc/design
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-09 14:58:03 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-09 14:58:03 -0400
commita85b537dd2fd3e6cdb02f6dd030a5fd112561308 (patch)
treee53e552e6e74709b72d88b41abed7de18339468e /doc/design
parentdcaa93dd5aff1be6e085f689672c2ec35d5f49f1 (diff)
parent33555fa6be83bbd511b50a1beda22c1527a9aace (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc/design')
-rw-r--r--doc/design/assistant/blog/day_122__xmpp_pairing/comment_2_30e251e73146512bde8b2f69eddeef2e._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/design/assistant/blog/day_122__xmpp_pairing/comment_2_30e251e73146512bde8b2f69eddeef2e._comment b/doc/design/assistant/blog/day_122__xmpp_pairing/comment_2_30e251e73146512bde8b2f69eddeef2e._comment
new file mode 100644
index 000000000..256b91242
--- /dev/null
+++ b/doc/design/assistant/blog/day_122__xmpp_pairing/comment_2_30e251e73146512bde8b2f69eddeef2e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.152.108.27"
+ subject="comment 2"
+ date="2012-11-09T17:41:08Z"
+ content="""
+Thanks, I think that's exactly what I should do.
+"""]]