merge madness

2014-10-19 16:12:05 -07:00
parent 6d3619c8b1
commit bae3029c63
64 changed files with 1261 additions and 1337 deletions
--- a/doc/git_for_non_developers.bb
+++ b/doc/git_for_non_developers.bb
@@ -68,4 +68,4 @@ git request-pull master https://example.com/project

 And simply send the output to the project maintainer.

-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;