summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2016-02-02 12:04:29 -0400
committerJoey Hess2016-02-02 12:04:29 -0400
commit13c4e0dd003ed18aed5131e28ace4a54a447fd54 (patch)
tree7c15f5b06075e2e29513c2cbbd135c3215535b7a /doc
parent5b579d9c7ea193c5f721ff5aa6ec6729ee5524f7 (diff)
parent1671aae6d464f090f255dfe676e89db5345fd48a (diff)
Merge branch 'master' of ssh://propellor.branchable.com
Diffstat (limited to 'doc')
-rw-r--r--doc/todo/Fix___40__-__62__-__41___signature_in_Propellor.Types.Container.mdwn2
-rw-r--r--doc/todo/concurrency/comment_1_0c428752e38798f0e8c8a72457c0a670._comment8
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/todo/Fix___40__-__62__-__41___signature_in_Propellor.Types.Container.mdwn b/doc/todo/Fix___40__-__62__-__41___signature_in_Propellor.Types.Container.mdwn
new file mode 100644
index 00000000..796802b8
--- /dev/null
+++ b/doc/todo/Fix___40__-__62__-__41___signature_in_Propellor.Types.Container.mdwn
@@ -0,0 +1,2 @@
+Please merge this commit
+https://github.com/miniBill/propellor/commit/0d9cd127c3448998aa4e4d20a8ce4083ee4b4362
diff --git a/doc/todo/concurrency/comment_1_0c428752e38798f0e8c8a72457c0a670._comment b/doc/todo/concurrency/comment_1_0c428752e38798f0e8c8a72457c0a670._comment
new file mode 100644
index 00000000..f5505140
--- /dev/null
+++ b/doc/todo/concurrency/comment_1_0c428752e38798f0e8c8a72457c0a670._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="cmt.miniBill@1ee673129c276f72c8d7c2974091af7618a22c2a"
+ nickname="cmt.miniBill"
+ subject="Output"
+ date="2016-02-01T23:09:49Z"
+ content="""
+Didn't you solve the output problem for git-annex?
+"""]]