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

Updating Readme and Creating a /weapons endpoint. #5

Merged
merged 4 commits into from
Jul 20, 2019
Merged

Updating Readme and Creating a /weapons endpoint. #5

merged 4 commits into from
Jul 20, 2019

Conversation

augustjohnson
Copy link
Collaborator

No description provided.

@augustjohnson
Copy link
Collaborator Author

Heyo, this should be an easy merge

@eepMoody
Copy link
Collaborator

Looking into it right now! It looks like it isn't building in dockercloud for some reason. Going to re-run, but if it doesn't work could you try merging in from Master just to be safe?

@augustjohnson augustjohnson changed the title Making the readme for the project a bit more legit Updating Readme and Creating a /weapons endpoint. Jul 18, 2019
@augustjohnson
Copy link
Collaborator Author

I haven't checked your dockercloud stuff... but I did modify the weapons doc and I added a /weapons endpoint.

@eepMoody eepMoody merged commit ff60e53 into open5e:master Jul 20, 2019
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.

2 participants