aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/classConversation.html
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-10-01 22:58:44 +0100
committerThomas Willingham <founder@kakste.com>2013-10-01 22:58:44 +0100
commit70fd797994e4b861d20d99cec2a7d801e478d894 (patch)
tree5b00b61522f2c7136912396df54bd3251e3f17c8 /doc/html/classConversation.html
parent2c9c206808fec2212141f8630ce534ed29a47037 (diff)
parent27e97571d44f9e69a66eead9da2de4209996457d (diff)
downloadvolse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.gz
volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.bz2
volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc/html/classConversation.html')
-rw-r--r--doc/html/classConversation.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/html/classConversation.html b/doc/html/classConversation.html
index 22be4c4b0..913f04052 100644
--- a/doc/html/classConversation.html
+++ b/doc/html/classConversation.html
@@ -487,7 +487,7 @@ Additional Inherited Members</h2></td></tr>
</table>
</div><div class="memdoc">
-<p>Referenced by <a class="el" href="classConversation.html#ae3d4190142e12b57051f11f2911f77a0">get_observer()</a>, and <a class="el" href="classConversation.html#a66f121ca4026246f86a732e5faa0682c">set_mode()</a>.</p>
+<p>Referenced by <a class="el" href="classConversation.html#a8335cdd43f1836e3c255638e61a09e16">add_thread()</a>, <a class="el" href="classConversation.html#ae3d4190142e12b57051f11f2911f77a0">get_observer()</a>, and <a class="el" href="classConversation.html#a66f121ca4026246f86a732e5faa0682c">set_mode()</a>.</p>
</div>
</div>