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

Admin example #104

Merged
merged 7 commits into from
Jun 11, 2017
Merged

Admin example #104

merged 7 commits into from
Jun 11, 2017

Conversation

seanmarcia
Copy link
Member

@seanmarcia seanmarcia commented Jun 8, 2017

DON'T MERGE. This branch is just for demo purposes and for testing the CI/CD. This is a demo for issue #15

@cattywampus
Copy link
Collaborator

With a PR like this, you make it really tempting to merge this... 😈

@seanmarcia seanmarcia changed the title Admin example -- DON'T MERGE Admin example Jun 11, 2017
@seanmarcia
Copy link
Member Author

Added in all the stuff @armahillo and I paired on! I think it is good to go :)

@armahillo
Copy link
Collaborator

I'M TOTALLY MERGING IT

@armahillo armahillo merged commit eb3d4b8 into master Jun 11, 2017
@armahillo armahillo deleted the admin_example branch June 11, 2017 18:25
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