OpenTechSchool/social-coding — pull request #1 by funkybrain (2012-10-22 14:50:47+00:00)
Title: First pull request on extra heroku module

Hey Steven/Benoit

I just created a small stub for the push-to-heroku page.

I do have a couple of problems you can help me with:
1. I can't display the gif image... what did I get wrong in the syntax?
2. I tried to merge upstream changes with 'git merge upstream/master' but it tells me upstream "master does not point to a commit"... should it not just use my last commit? I of course fetched the changes first.

Danke!
-Manu