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/include_2group_8php.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/include_2group_8php.html')
| -rw-r--r-- | doc/html/include_2group_8php.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/html/include_2group_8php.html b/doc/html/include_2group_8php.html index 86f931911..edab06950 100644 --- a/doc/html/include_2group_8php.html +++ b/doc/html/include_2group_8php.html @@ -186,7 +186,7 @@ Functions</h2></td></tr> </table> </div><div class="memdoc"> -<p>Referenced by <a class="el" href="identity_8php.html#a345f4c943d84de502ec6e72d2c813945">create_identity()</a>, and <a class="el" href="mod_2group_8php.html#aed1f009b1221348021bb34761160ef35">group_post()</a>.</p> +<p>Referenced by <a class="el" href="identity_8php.html#a345f4c943d84de502ec6e72d2c813945">create_identity()</a>, <a class="el" href="mod_2group_8php.html#aed1f009b1221348021bb34761160ef35">group_post()</a>, and <a class="el" href="settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586">settings_post()</a>.</p> </div> </div> @@ -226,7 +226,7 @@ Functions</h2></td></tr> </table> </div><div class="memdoc"> -<p>Referenced by <a class="el" href="connections_8php.html#a1224058db8e3fb56463eb312f98e561d">connections_post()</a>, <a class="el" href="connedit_8php.html#a234c48426b652bf4d37053f2af329ac5">connedit_post()</a>, <a class="el" href="contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3">contactgroup_content()</a>, <a class="el" href="identity_8php.html#a345f4c943d84de502ec6e72d2c813945">create_identity()</a>, <a class="el" href="diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598">diaspora_request()</a>, <a class="el" href="mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83">group_content()</a>, and <a class="el" href="include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7">new_contact()</a>.</p> +<p>Referenced by <a class="el" href="connections_8php.html#a1224058db8e3fb56463eb312f98e561d">connections_post()</a>, <a class="el" href="connedit_8php.html#a234c48426b652bf4d37053f2af329ac5">connedit_post()</a>, <a class="el" href="contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3">contactgroup_content()</a>, <a class="el" href="identity_8php.html#a345f4c943d84de502ec6e72d2c813945">create_identity()</a>, <a class="el" href="diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598">diaspora_request()</a>, <a class="el" href="mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83">group_content()</a>, <a class="el" href="include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7">new_contact()</a>, and <a class="el" href="settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586">settings_post()</a>.</p> </div> </div> |