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

Fix JSON conflict between #293 and #292 #294

Merged

excpt merged 1 commit into jwt:master from anakinj:fix-json-conflict-issue

Jan 21, 2019

Member

anakinj commented Jan 21, 2019

Hi, there were some conflicting changes between #293 and #292. This PR should fix that.


          Fix JSON conflict between jwt#293 and jwt#292

39a9224

Member Author

anakinj commented Jan 21, 2019

@excpt, there were some incompatibilities between the lates two branches merged to master. This change should make those compatible with each other.

excpt self-requested a review

January 21, 2019 12:31

excpt approved these changes

View reviewed changes

excpt merged commit 7a9f1b2 into jwt:master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet