Skip to content

Conversation

@backstroke-bot
Copy link

Hello!
The remote 1egoman/funnies has some new changes that aren't in this fork.

So, here they are, ready to be merged! 🎉

If this pull request can be merged without conflict, you can publish your software
with these new changes. Otherwise, if you have merge conflicts, this
is the place to fix them.

Have fun! 👋

From,
🏊 Your Neighborly Backstroke Bot

PS. Hey, there's a new version of Backstroke available. If you'd like to configure repo-to-repo syncing or sync to all forks, check it out here.

maxcaluva and others added 30 commits October 2, 2017 18:00
* chore: removed a couple political funnies

I've let a couple slip through in the past and I think it's better that these stay less political so everyone can find them funny.

* chore: add comma
* add funny phrase

* Added funny - line 214
* Update funnies.js

* Update funnies.js
* added more funnies

* Update funnies.js
Added a new entry to improve product. :)
* Add some "jokes"

* Made joke funnier!

* Reverse accidental change of double- to singel-quotes
* fixed typo line 216

* Typo line 188

* Typo line 101

* duplicate -- lines 81 and 86 (removed 86)
At some point along the line, funnies ended up unintentionally requiring a dependency on react.
Break out the react-only code into it's own module.
Because you can't have enough of Chuck Norris
* fix: add node v12 to ci tests, update version of react

* dist: update built docs bundle

* fix: update gulp to v4 so that it works on node v12
* Added more phrases

added four.

* Added more phrases

Added more phrases.
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.