diff options
author | mrjive <mrjive@mrjive.it> | 2015-10-26 21:55:47 +0100 |
---|---|---|
committer | mrjive <mrjive@mrjive.it> | 2015-10-26 21:55:47 +0100 |
commit | a4c3058f845a1c38d06b2201a10700c5f878366d (patch) | |
tree | bab86468397e523457ba25199cb9a67265980e00 /doc/html/index.php | |
parent | 32522b61f235266384c81c0669fceaf58afeb4fe (diff) | |
parent | 6cb7afcbc0447b60de0128f9a912e10ae125ba45 (diff) | |
download | volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.tar.gz volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.tar.bz2 volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.zip |
Merge pull request #7 from redmatrix/master
updating from original codebase
Diffstat (limited to 'doc/html/index.php')
-rw-r--r-- | doc/html/index.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/doc/html/index.php b/doc/html/index.php index 4ef28aada..2e1b4277c 100644 --- a/doc/html/index.php +++ b/doc/html/index.php @@ -1,17 +1,11 @@ <!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 |