diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-27 12:24:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-27 12:24:03 -0400 |
| commit | 9e3753eb3a51147c65b3048e6197227093098de6 (patch) | |
| tree | 7cd61027d5e69006c9e0027d4c4a4e926e295d7c /Git.hs | |
| parent | e6c56461ff420581ad45f37ba797ad2545740404 (diff) | |
| parent | f795ef0bece363d00e50e556d14d75f4731d7fe4 (diff) | |
Merge branch 'master' into newchunks
Conflicts:
doc/design/assistant/chunks.mdwn
Diffstat (limited to 'Git.hs')
0 files changed, 0 insertions, 0 deletions