Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use correct file when loading settings from userconfig #666

Merged
merged 1 commit into from
May 5, 2017
Merged

Use correct file when loading settings from userconfig #666

merged 1 commit into from
May 5, 2017

Conversation

jonpas
Copy link
Member

@jonpas jonpas commented May 4, 2017

When merged this pull request will:

  • Title
  • Server-side userconfig was always used due to direct macro usage instead of the actual file found above.

@PabstMirror PabstMirror requested a review from commy2 May 4, 2017 20:00
@commy2 commy2 added this to the 3.4 milestone May 5, 2017
@commy2 commy2 added the Bug Fix label May 5, 2017
@commy2 commy2 self-assigned this May 5, 2017
@Killswitch00 Killswitch00 merged commit 56e7f76 into CBATeam:master May 5, 2017
@jonpas jonpas deleted the fixSettingsLoad branch May 5, 2017 16:25
@jonpas jonpas mentioned this pull request May 17, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@commy2 commy2 commy2 approved these changes

Assignees

@commy2 commy2

Labels
Bug Fix
Projects
None yet
Milestone
3.4
Development

Successfully merging this pull request may close these issues.
3 participants
@jonpas @commy2 @Killswitch00