Merge remote-tracking branch 'origin' into user_lua

This commit is contained in:
Dax T. Games
2018-09-01 14:35:41 -04:00
24 changed files with 480 additions and 185 deletions

2
.gitignore vendored
View File

@ -14,9 +14,11 @@ build/
Version v*
*.bak
config/user-*
config/user_*
config/*.lua
config/settings
config/aliases
config/profile.d
.github_changelog_generator
launcher/.vs
launcher/src/version.rc2