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

s/blacklist/blocklist/g #329

Merged
merged 2 commits into from Nov 3, 2016
Merged

s/blacklist/blocklist/g #329

merged 2 commits into from Nov 3, 2016

Conversation

@beaufortfrancois
Copy link
Member

@beaufortfrancois beaufortfrancois commented Nov 2, 2016

Following #327 discussion, here's a patch that renames Blacklist to Blocklist.

@g-ortuno
Copy link
Contributor

@g-ortuno g-ortuno commented Nov 2, 2016

Seems there are some conflicts. Please rebase.

… renameBlacklist
@beaufortfrancois
Copy link
Member Author

@beaufortfrancois beaufortfrancois commented Nov 3, 2016

Rebase is done.

@scheib scheib merged commit 1d5cfa4 into master Nov 3, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@scheib scheib deleted the renameBlacklist branch Nov 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.