search

Alanaktion / MCHostPanel

A lightweight Minecraft server control panel for hosting services
MIT License
117 stars 59 forks source link

Merge pull request #2 from Alanaktion/master #36

Closed JRogaishio closed 8 years ago

JRogaishio commented 8 years ago

Pull in upstream changes

Alanaktion commented 8 years ago

Just so you know, you are able to merge in upstream changes directly with git:

git remote add upstream git@github.com:Alanaktion/MCHostPanel.git
git fetch upstream
git merge upstream/master
JRogaishio commented 8 years ago

Thanks. That was my bad. I just wanted to get a pretty diff but GitHub reversed the repos.