]> git.proxmox.com Git - libgit2.git/commitdiff
Merge branch 'master' into pr/3938
authorEdward Thomson <ethomson@github.com>
Sat, 21 Jan 2017 22:39:59 +0000 (22:39 +0000)
committerEdward Thomson <ethomson@github.com>
Sat, 21 Jan 2017 22:39:59 +0000 (22:39 +0000)
1  2 
CHANGELOG.md
src/submodule.c

diff --cc CHANGELOG.md
Simple merge
diff --cc src/submodule.c
Simple merge