Skip to content

Conversation

@1egoman
Copy link

@1egoman 1egoman commented Jan 18, 2017

Hello!
The remote Madek/madek-instance 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.

ideally the README shouldn’t change so forks that edited theirs don’t get merge conflicts
eins78 added 13 commits January 25, 2017 13:56
move examples into a folder

add upgrade script
not needed for simple setup (1 host)
its faster because we don't need everything
from now on all updates to this project (pushes to `master`)
will only happen once for each Madek release

all commits will be prefixed like this one (or [Madek] for Madek relases)
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.

4 participants