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

Update from upstream repo the-upstream/frog@master #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

1egoman
Copy link
Contributor

@1egoman 1egoman commented Nov 12, 2017

Hello!

The upstream repository the-upstream/frog@master has some new changes that aren't in this repository. So, here they are, ready to be merged! 🎉

Since this repository isn't in the same network as the upstream, I've copied the contents of the upstream repository into the the-upstream branch within a temporary repository to make syncing an out-of-network upstream possible - Read more.

If this pull request can be merged without conflict, you can publish your softwarewith these new changes. Otherwise, fix any merge conflicts by clicking the Resolve Conflictsbutton.


If you like Backstroke, consider chipping in to help pay the server bill here. Backstroke is a completely open source project that's free to use, but we survive on sponsorships and donations. Thanks for your support! Help out Backstroke.


Created by Backstroke (I'm a bot!)

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.

1 participant