Merge branch 'master' of https://github.com/AstRonin/sgi · AstRonin/sgi@acd7232 · GitHub

Commit

Merge branch 'master' of https://github.com/AstRonin/sgi

Browse files

Conflicts:
	README.md

Loading branch information

Roman Shuplov committed Oct 20, 2016

2 parents 3f39b28 + d8c36b6 commit acd7232