Merge branch 'feature/installation-improvements' of https://github.co… · ukdtom/WebTools.bundle@0081275 · GitHub

Commit

Merge branch 'feature/installation-improvements' of https://github.co…

Browse files

…m/fuzeman/WebTools.bundle into fuzeman-feature/installation-improvements

Conflicts:
	Contents/Code/git.py

Merge conflict

Loading branch information

ukdtom committed Mar 19, 2016

2 parents b2d10e3 + 2a205c2 commit 0081275