PyroCMS v0.9.7.4 - an open-source modular general purpose CMS

[eluser]Phil Sturgeon[/eluser]
[quote author="Yorick Peterse" date="1243542472"]I can't see the changes on Git yet, or haven't you uploaded them yet?[/quote]

This was solved on Skype, just Yorick being a muppet and not understanding Git :-p

For those of you using Git run:

Code:

git stash
git pull origin master
git stash apply

That will make sure any local changes are stashed safe before you grab the new code, then reapplies your local changes.