pulling to latest changes #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add JSON schema test. * Add Travis CI config. * Add Travis CI badge.
* Bigger. Better? Stronger. * Update README * Not actually using uglify. * Update travis to not drag in all the gulp crap. Closes #75
* Fixed spelling of margarita. Also "Blue's Clues." * Renamed margarita parrot gif to correct spelling. * Renamed bluescluesparrot.gif to match change in 8f972ce.
Instead of linking to the GitHub repo, linking to the UI to create Party Parrots (with approval from original creator of PPaaS)
* Let's get this Love Parrot partying!!! * Replace opening curly bracket accidentally deleted in conflict resolution.
* Adding HD Gentleman Parrot * Move hd parrots around and fix tests. * Add HD parrots to the zip. * HD parrots in templates. * Add more HD parrots. HT to r/PartyParrot and _korbendallas_ https://www.reddit.com/r/PartyParrot/comments/5l5nya/12_days_of_partyparrot_day_12/
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.