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.

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

Sync Impostor with 6pak fork #327

Merged
merged 29 commits into from
Mar 3, 2021
Merged

Conversation

js6pak
Copy link
Member

@js6pak js6pak commented Mar 1, 2021

Closes #160
Closes #263
Closes #260
Closes #257
Closes #286
Closes #161
Closes #281
Closes #92
Closes #279

@AeonLucid
Copy link
Collaborator

AeonLucid commented Mar 1, 2021

We really gotta do something about that warning spam inside of AppVeyor (for a later PR). Either

  • fix what it is complaining about
  • fix our codestyle config

and not ignore it

@AeonLucid AeonLucid changed the title Watch aeon scam me again Sync Impostor with 6pak fork Mar 1, 2021
src/.gitignore Outdated Show resolved Hide resolved
@zokradonh zokradonh mentioned this pull request Mar 2, 2021
3 tasks
Copy link
Collaborator

@AeonLucid AeonLucid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm hf

@js6pak js6pak merged commit 87a062c into Impostor:dev Mar 3, 2021
@js6pak js6pak deleted the watch-aeon-scam-me-again branch March 3, 2021 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment