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

Removed ambiguously misappropriated cultural references from readme #275

Merged
merged 2 commits into from
Apr 24, 2018

Conversation

reallistic
Copy link

No description provided.

@mlitchard
Copy link

Why hasn't this been merged yet?

@rimiti
Copy link
Contributor

rimiti commented Apr 23, 2018

@reallistic can you update your PR to resolve conflicts ?

# Conflicts:
#	Readme.md
#	example.js
@reallistic
Copy link
Author

updated

@rimiti rimiti changed the base branch from master to release-v3.1.0 April 24, 2018 07:56
@rimiti rimiti self-assigned this Apr 24, 2018
@rimiti rimiti merged commit 67dea2c into ladjs:release-v3.1.0 Apr 24, 2018
@rimiti rimiti mentioned this pull request Apr 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants