summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-07 12:59:59 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-07 12:59:59 -0400
commit44c092200c200f3b7d29c65dc0e0dee993b31dae (patch)
treed3ea8327cb796d5a41c31f5f19cd6f92847431b5
parent78927f7609aceb9c4d2a6dcbacd6a9c1470a5bfe (diff)
parent07dc28ac316373c68b1f49930a5a53cbe2f1413b (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/devblog/day_95__reconnection_revisited/comment_1_c1106e573fcf9f3d4524c0e4f4254790._comment8
-rw-r--r--doc/forum/Gitolite_problems.mdwn1
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/devblog/day_95__reconnection_revisited/comment_1_c1106e573fcf9f3d4524c0e4f4254790._comment b/doc/devblog/day_95__reconnection_revisited/comment_1_c1106e573fcf9f3d4524c0e4f4254790._comment
new file mode 100644
index 000000000..67618f64d
--- /dev/null
+++ b/doc/devblog/day_95__reconnection_revisited/comment_1_c1106e573fcf9f3d4524c0e4f4254790._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns"
+ nickname="Jan Ulrich"
+ subject="comment 1"
+ date="2014-01-07T16:02:01Z"
+ content="""
+Thanks for the Mavericks fix!
+"""]]
diff --git a/doc/forum/Gitolite_problems.mdwn b/doc/forum/Gitolite_problems.mdwn
index 903444cc8..15b7d6269 100644
--- a/doc/forum/Gitolite_problems.mdwn
+++ b/doc/forum/Gitolite_problems.mdwn
@@ -8,3 +8,4 @@ Instead, got: "annex.uuid=\ncore.gcrypt-id=\n"
Has anyone found any solution to this? Also, I am using the latest version of Gitolite, because I wanted to see whether it would work.
Thanks, Zack.
+EDIT: It might also be worthy to note that I did have a go at following the guide on this site.