diff options
| author | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
|---|---|---|
| committer | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
| commit | b5fad9feefd0f261807222d8a4c42ead6253a65c (patch) | |
| tree | 399cd4a1b79f61530924ea59670af0bdd6cee5be /doc/html/annotated.js | |
| parent | 89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff) | |
| parent | b29a968be8df52cd7c9b6d5bebb618534788337c (diff) | |
| download | volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2 volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip | |
Fix merge conflict
Diffstat (limited to 'doc/html/annotated.js')
| -rw-r--r-- | doc/html/annotated.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/html/annotated.js b/doc/html/annotated.js index 5ab4ca9b5..79baf4d64 100644 --- a/doc/html/annotated.js +++ b/doc/html/annotated.js @@ -4,6 +4,7 @@ var annotated = [ "Friendica", "namespaceFriendica.html", null ], [ "friendica-to-smarty-tpl", "namespacefriendica-to-smarty-tpl.html", null ], [ "RedMatrix", "namespaceRedMatrix.html", "namespaceRedMatrix" ], + [ "Redmatrix", "namespaceRedmatrix.html", "namespaceRedmatrix" ], [ "updatetpl", "namespaceupdatetpl.html", null ], [ "util", "namespaceutil.html", null ], [ "App", "classApp.html", "classApp" ], |