padrino/padrino-framework — pull request #1411 by matthias-guenther (2013-09-14 04:44:50+00:00)
Title: Gen documentation cleanup

This time I rebased against master and resolved conflicts ans just add the resolved files with `git add` and was wondering why no additional commits occured. I used git push with the `--force` option to push the resolved conflicts. If there are no conflicts, I think I will then have finally understood pull requests.

Cheers from Berlin

Matthias