Merge remote-tracking branch 'upstream/master'

1 files changed, 9 insertions, 3 deletions

diff --git a/doc/html/conversation_8php.js b/doc/html/conversation_8php.js
index 69820960f..4417191d0 100644
--- a/doc/html/conversation_8php.js
+++ b/doc/html/conversation_8php.js
@@ -1,19 +1,25 @@
 var conversation_8php =
 [
     [ "add_children_to_list", "conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b", null ],
-    [ "best_link_url", "conversation_8php.html#a32e7750ae6adbfdd1f227f6e89221ce3", null ],
+    [ "best_link_url", "conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7", null ],
     [ "conv_sort", "conversation_8php.html#abed85a41f1160598de880b84021c9cf7", null ],
+    [ "conversation", "conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1", null ],
     [ "count_descendants", "conversation_8php.html#ab2383dff4f823e580399ff469d90ab19", null ],
     [ "find_thread_parent_index", "conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6", null ],
+    [ "format_like", "conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3", null ],
     [ "format_location", "conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3", null ],
     [ "get_item_children", "conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67", null ],
-    [ "localize_item", "conversation_8php.html#afea815dd1768e8417d2b30be53e9e0b4", null ],
+    [ "item_extract_images", "conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654", null ],
+    [ "item_photo_menu", "conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3", null ],
+    [ "item_redir_and_replace_images", "conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533", null ],
+    [ "like_puller", "conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0", null ],
+    [ "localize_item", "conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c", null ],
     [ "prepare_page", "conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c", null ],
     [ "render_location_default", "conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2", null ],
     [ "sort_item_children", "conversation_8php.html#ae996eb116d397a2c6396c312d7b98664", null ],
     [ "sort_thr_commented", "conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11", null ],
     [ "sort_thr_created", "conversation_8php.html#ac55e070f65f46fcc8e269f7896be4c7d", null ],
     [ "sort_thr_created_rev", "conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0", null ],
-    [ "status_editor", "conversation_8php.html#aedf008b9eac87f693d7dcc1a01404d85", null ],
+    [ "status_editor", "conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a", null ],
     [ "visible_activity", "conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3", null ]
 ];
\ No newline at end of file