summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-10-19 15:59:11 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-10-19 15:59:11 -0400
commit6559db49da42c6e56f29c49eaa0e0fde23ed017e (patch)
tree4943608b12f1f21e3c92428f8ab1140ff68d1bcf
parent5aa72d81d0d17c85bd2512bc53e36da15f89ac97 (diff)
parent6eed82adc397da801e4376c943483d993f598648 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/news/version_5.20151019/comment_2_86e58bc881269cb29fcbeefec94f8846._comment7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/news/version_5.20151019/comment_2_86e58bc881269cb29fcbeefec94f8846._comment b/doc/news/version_5.20151019/comment_2_86e58bc881269cb29fcbeefec94f8846._comment
new file mode 100644
index 000000000..865e6730e
--- /dev/null
+++ b/doc/news/version_5.20151019/comment_2_86e58bc881269cb29fcbeefec94f8846._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ subject="comment 2"
+ date="2015-10-19T19:58:36Z"
+ content="""
+S3 is enabled by default; this version can be built with it disabled if desired
+"""]]