diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-01 20:38:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-01 20:38:23 -0400 |
| commit | e6d55ae49c36e17938a0f143652a865ff7197cf4 (patch) | |
| tree | 25a8c253c7e6c2f4783452b85022f70afeb57fff | |
| parent | 32ab049f9c29376f2ab07aabae788a307aefab06 (diff) | |
| parent | f23a687de0ca92662ea13d0c830d5c19581fae3a (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/design/assistant/blog/day_66__the_merge/comment_9_c06dab4d78122c85beeaf300ffc3e376._comment | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/design/assistant/blog/day_66__the_merge/comment_9_c06dab4d78122c85beeaf300ffc3e376._comment b/doc/design/assistant/blog/day_66__the_merge/comment_9_c06dab4d78122c85beeaf300ffc3e376._comment new file mode 100644 index 000000000..5a2b3c8d1 --- /dev/null +++ b/doc/design/assistant/blog/day_66__the_merge/comment_9_c06dab4d78122c85beeaf300ffc3e376._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.246.16" + subject="comment 9" + date="2012-09-01T19:32:02Z" + content=""" +I think I've fixed that. +"""]] |