summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-24 00:50:52 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-24 00:50:52 -0400
commit0df7c2f38ef9c556c28e53b9b5b30df4a82c77e4 (patch)
tree08ff7712a1f98668457cb9af3a98be580fabfa1e
parent9d76fe14e3c93d38445529bf4217d5659b3a053c (diff)
parent69b97b0e851b0998c15716048705037f54a95cad (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/forum/Can__39__t_get_jabber_working/comment_4_259741e146906ff70540390bdfe07002._comment8
-rw-r--r--doc/forum/do_not_use_git-annex_inside_your_Dropbox/comment_1_5a1dc9da6e6861829e321446ec7991ee._comment8
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/forum/Can__39__t_get_jabber_working/comment_4_259741e146906ff70540390bdfe07002._comment b/doc/forum/Can__39__t_get_jabber_working/comment_4_259741e146906ff70540390bdfe07002._comment
new file mode 100644
index 000000000..005759caf
--- /dev/null
+++ b/doc/forum/Can__39__t_get_jabber_working/comment_4_259741e146906ff70540390bdfe07002._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlm_3m5gLhML9bHbZ8FpJ-HBZhWaRfFeO8"
+ nickname="Corey"
+ subject="Same bug? OSX 10.9.1"
+ date="2014-01-23T23:38:32Z"
+ content="""
+… using Chrome. Connection to 127.0.0.1:XXXXX interrupted when setting up Jabber.
+"""]]
diff --git a/doc/forum/do_not_use_git-annex_inside_your_Dropbox/comment_1_5a1dc9da6e6861829e321446ec7991ee._comment b/doc/forum/do_not_use_git-annex_inside_your_Dropbox/comment_1_5a1dc9da6e6861829e321446ec7991ee._comment
new file mode 100644
index 000000000..d5da4f000
--- /dev/null
+++ b/doc/forum/do_not_use_git-annex_inside_your_Dropbox/comment_1_5a1dc9da6e6861829e321446ec7991ee._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="sascha"
+ ip="2a02:8108:5c0:3ec:615a:1ac3:c7b9:a3a9"
+ subject="so how can i keep in sync a dropbox subfolder with a usbdrive"
+ date="2014-01-24T04:32:38Z"
+ content="""
+my usecase is i want to be able to be working on other computers on files that i have on my thumb-usb-drive. Back home i want to sync changes back to the subfolder of my local Dropbox-directory. Any suggestions?
+"""]]