diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
| commit | 4d49342612dd441cdc503b5294035fc05a9a5a77 (patch) | |
| tree | 435a82d44b5a6aa3df411b36fb9fad2553cc670a /doc/todo/smudge/comment_6_86f536515575a6c2ed3a89c80b2c232f._comment | |
| parent | 44a48a19ffeb8085e7ae1f6bf58d5661adaf8a8d (diff) | |
| parent | 5cd9e10cde3c06ecc6a97f5f60a9def22f959bd2 (diff) | |
Merge branch 'master' into concurrentprogress
Conflicts:
Command/Fsck.hs
Messages.hs
Remote/Directory.hs
Remote/Git.hs
Remote/Helper/Special.hs
Types/Remote.hs
debian/changelog
git-annex.cabal
Diffstat (limited to 'doc/todo/smudge/comment_6_86f536515575a6c2ed3a89c80b2c232f._comment')
| -rw-r--r-- | doc/todo/smudge/comment_6_86f536515575a6c2ed3a89c80b2c232f._comment | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/todo/smudge/comment_6_86f536515575a6c2ed3a89c80b2c232f._comment b/doc/todo/smudge/comment_6_86f536515575a6c2ed3a89c80b2c232f._comment new file mode 100644 index 000000000..6a15157bc --- /dev/null +++ b/doc/todo/smudge/comment_6_86f536515575a6c2ed3a89c80b2c232f._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="tomekwi" + subject="comment 6" + date="2015-04-29T20:38:51Z" + content=""" +Thanks! Looks great :) +"""]] |