summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-15 16:31:36 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-15 16:31:36 -0400
commitedce4022cda9f66c68f95acab4ea7647e8354cc8 (patch)
tree875f837765235a80eda7af47f563e2ff5f7d5579
parent88e387c1787116c8e8dc2f0f4f0eca2f3269edec (diff)
parentcdb8e78c1d75cee70e7e5adc76a9cc18b77cfdfe (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/bugs/Mac_OS_10.9_GPG_error_adding_S3_repo/comment_7_e519df252875de87c4ef5b727f033bdf._comment8
-rw-r--r--doc/todo/wishlist:_disable_automatic_commits.mdwn2
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/bugs/Mac_OS_10.9_GPG_error_adding_S3_repo/comment_7_e519df252875de87c4ef5b727f033bdf._comment b/doc/bugs/Mac_OS_10.9_GPG_error_adding_S3_repo/comment_7_e519df252875de87c4ef5b727f033bdf._comment
new file mode 100644
index 000000000..a67c59451
--- /dev/null
+++ b/doc/bugs/Mac_OS_10.9_GPG_error_adding_S3_repo/comment_7_e519df252875de87c4ef5b727f033bdf._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.246"
+ subject="comment 7"
+ date="2013-11-15T19:00:25Z"
+ content="""
+It would be useful if you could test with the 10.9 build now available in [[install/OSX]].
+"""]]
diff --git a/doc/todo/wishlist:_disable_automatic_commits.mdwn b/doc/todo/wishlist:_disable_automatic_commits.mdwn
index 5b39c60c7..14c131796 100644
--- a/doc/todo/wishlist:_disable_automatic_commits.mdwn
+++ b/doc/todo/wishlist:_disable_automatic_commits.mdwn
@@ -33,4 +33,4 @@ detecting manual commits wouldn't be a stretch.
> You can do this now by pausing committing via the webapp,
> or setting `annex.autocommit=false`.
>
-> The assustant probably doesn't push such commits yet.
+> The assistant probably doesn't push such commits yet.