diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-13 00:29:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-13 00:29:06 -0400 |
| commit | de6406afce6de0cf8a48bc2ecf9be1e7de93e40e (patch) | |
| tree | 08705fab60c11d4073734a8c2500a88b1aab7852 /doc/preferred_content/comment_4_384025b5fa23a3f175985a081438149f._comment | |
| parent | 3e55a8f164d67d5bd1ef86ae2f38fb2c6c3a51b2 (diff) | |
| parent | 94554782894ec6c26da3b46312d5d1d16d596458 (diff) | |
Merge branch 'master' into desymlink
Conflicts:
Annex/CatFile.hs
Annex/Content.hs
Git/LsFiles.hs
Git/LsTree.hs
Diffstat (limited to 'doc/preferred_content/comment_4_384025b5fa23a3f175985a081438149f._comment')
| -rw-r--r-- | doc/preferred_content/comment_4_384025b5fa23a3f175985a081438149f._comment | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/preferred_content/comment_4_384025b5fa23a3f175985a081438149f._comment b/doc/preferred_content/comment_4_384025b5fa23a3f175985a081438149f._comment new file mode 100644 index 000000000..e6d13ca04 --- /dev/null +++ b/doc/preferred_content/comment_4_384025b5fa23a3f175985a081438149f._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.153.8.117" + subject="comment 4" + date="2012-12-10T19:46:01Z" + content=""" +It was a bug in the backup group's preferred content pagespec, introduced by the changes I made to fix the previous problem. Now fixed. +"""]] |