diff options
| author | Wave <wave72@users.noreply.github.com> | 2015-11-06 09:09:58 +0100 |
|---|---|---|
| committer | Wave <wave72@users.noreply.github.com> | 2015-11-06 09:09:58 +0100 |
| commit | 30d083ac3cbdf36171cfee7b892271b9b587325c (patch) | |
| tree | f2f63728f86f8336330d31ee8edf2fcd742dc71e /doc/html/index.php | |
| parent | 50cf095c000813d0b1408d929c1fa7422b131a3d (diff) | |
| parent | 4ca0c2cfd14df5e2b6e9c7f59a10628f7653d6a4 (diff) | |
| download | volse-hubzilla-30d083ac3cbdf36171cfee7b892271b9b587325c.tar.gz volse-hubzilla-30d083ac3cbdf36171cfee7b892271b9b587325c.tar.bz2 volse-hubzilla-30d083ac3cbdf36171cfee7b892271b9b587325c.zip | |
Merge pull request #2 from redmatrix/master
Update to latest hubzilla
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 |