diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-13 19:23:13 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-13 19:23:13 -0700 |
| commit | 51b89f0ed8833004cf695de90791d8d0eec550b5 (patch) | |
| tree | 815c33e71b411e6f2b8c44ba0f619ee8a869d912 /doc/html | |
| parent | 475dc7b686d6939d88c79dd58df1ff751356a922 (diff) | |
| parent | f866a42a42b9e12756353f5bb39a0f31a64bb26a (diff) | |
| download | volse-hubzilla-51b89f0ed8833004cf695de90791d8d0eec550b5.tar.gz volse-hubzilla-51b89f0ed8833004cf695de90791d8d0eec550b5.tar.bz2 volse-hubzilla-51b89f0ed8833004cf695de90791d8d0eec550b5.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
doc/DerivedTheme1.md
doc/Developers.md
doc/Features.md
doc/Plugins.md
doc/Privacy.md
doc/README.md
doc/Remove-Account.md
doc/Translations.md
doc/about.bb
doc/account_basics.bb
doc/accounts_profiles_channels_basics.bb
doc/addons.bb
doc/addons_gnusocial.bb
doc/bbcode.html
doc/campaign.bb
doc/classRedmatrix_1_1Import_1_1Import-members.html
doc/classRedmatrix_1_1Import_1_1Import.html
doc/cloud.bb
doc/connecting_to_channels.bb
doc/connecting_to_channels.md
doc/credits.bb
doc/de/channels.bb
doc/de/features.bb
doc/de/main.bb
doc/de/registration.bb
doc/developers.bb
doc/encryption.bb
doc/external-resource-links.bb
doc/extra_features.bb
doc/faq_admins.bb
doc/faq_developers.bb
doc/faq_members.bb
doc/features.bb
doc/hidden_configs.bb
doc/history.md
doc/html/index.php
doc/main.bb
doc/permissions.bb
doc/plugins.bb
doc/problems-following-an-update.bb
doc/profiles.bb
doc/red2pi.bb
doc/registration.bb
doc/roadmap.bb
doc/sv/main.bb
doc/what_is_zot.bb
doc/zot.md
Diffstat (limited to 'doc/html')
| -rw-r--r-- | doc/html/index.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/html/index.php b/doc/html/index.php index 1796685a2..4ef28aada 100644 --- a/doc/html/index.php +++ b/doc/html/index.php @@ -1,10 +1,17 @@ <!DOCTYPE html> <html> <head> +<<<<<<< HEAD <title>Hubzilla Doxygen API Documentation</title> </head> <body> <h1>Hubzilla Doxygen API Documentation not rendered</h1> +======= + <title>$Projectname Doxygen API Documentation</title> +</head> +<body> +<h1>$Projectname Doxygen API Documentation not rendered</h1> +>>>>>>> f866a42a42b9e12756353f5bb39a0f31a64bb26a To get the Doxygen API Documentation you must render it with the program <a href="http://www.doxygen.org">Doxygen</a> (included in most distributions). <pre> $ doxygen util/Doxyfile |