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/globals.html | |
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/globals.html')
-rw-r--r-- | doc/html/globals.html | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/doc/html/globals.html b/doc/html/globals.html index d96b84b06..11075a6de 100644 --- a/doc/html/globals.html +++ b/doc/html/globals.html @@ -245,12 +245,6 @@ $(document).ready(function(){initNavTree('globals.html','');}); <li>$phpfile : <a class="el" href="php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4">php2po.php</a> </li> -<li>$plugin -: <a class="el" href="post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65">post_to_red.php</a> -</li> -<li>$plugin_dir -: <a class="el" href="post__to__red_8php.html#a99811555b30bde504a863e44015f2f19">post_to_red.php</a> -</li> <li>$pofile : <a class="el" href="php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1">php2po.php</a> </li> |