Merge remote-tracking branch 'magefree/master'

This commit is contained in:
Samuel Sandeen 2016-09-02 19:44:51 -04:00
commit 85dc15c5dc
61 changed files with 1443 additions and 702 deletions

1
.gitignore vendored
View file

@ -92,6 +92,7 @@ hs_err*.log
*.txt
Mage.Client/serverlist.txt
/bin/
/out/
/target/
client_secrets.json