aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/functions_func_0x67.html
diff options
context:
space:
mode:
authorStefan Parviainen <saparvia@caterva.eu>2014-11-08 20:53:41 +0100
committerStefan Parviainen <saparvia@caterva.eu>2014-11-08 20:53:41 +0100
commitb5fad9feefd0f261807222d8a4c42ead6253a65c (patch)
tree399cd4a1b79f61530924ea59670af0bdd6cee5be /doc/html/functions_func_0x67.html
parent89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff)
parentb29a968be8df52cd7c9b6d5bebb618534788337c (diff)
downloadvolse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz
volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2
volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip
Fix merge conflict
Diffstat (limited to 'doc/html/functions_func_0x67.html')
-rw-r--r--doc/html/functions_func_0x67.html30
1 files changed, 23 insertions, 7 deletions
diff --git a/doc/html/functions_func_0x67.html b/doc/html/functions_func_0x67.html
index 62ea2d3ae..2e4957360 100644
--- a/doc/html/functions_func_0x67.html
+++ b/doc/html/functions_func_0x67.html
@@ -168,7 +168,8 @@ $(document).ready(function(){initNavTree('functions_func_0x67.html','');});
: <a class="el" href="classItem.html#a632185dd25c5caf277067c76230a4320">Item</a>
</li>
<li>get_children()
-: <a class="el" href="classItem.html#aa0ee775ec94abccec6c798428835d001">Item</a>
+: <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a832a4cc0d33d0eea29cb450004054580">Redmatrix\Import\Import</a>
+, <a class="el" href="classItem.html#aa0ee775ec94abccec6c798428835d001">Item</a>
</li>
<li>get_cipher()
: <a class="el" href="classConversation.html#a4aab60bb39fa6761b6cacdc8d9da2901">Conversation</a>
@@ -182,6 +183,9 @@ $(document).ready(function(){initNavTree('functions_func_0x67.html','');});
<li>get_conversation()
: <a class="el" href="classItem.html#a0c301aaed2b7d682728d18db3a22afa3">Item</a>
</li>
+<li>get_credentials()
+: <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a76dd522e47a48d80e1678211230f2ff5">Redmatrix\Import\Import</a>
+</li>
<li>get_data()
: <a class="el" href="classItem.html#ad3638f93065693c1f69eb349feb1b7aa">Item</a>
</li>
@@ -203,6 +207,15 @@ $(document).ready(function(){initNavTree('functions_func_0x67.html','');});
<li>get_intltext_template()
: <a class="el" href="classFriendicaSmartyEngine.html#a35ec0ee828c36640ea25296bcb84a118">FriendicaSmartyEngine</a>
</li>
+<li>get_item()
+: <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#ae705dd1deb245b1d06baa73062330e43">Redmatrix\Import\Import</a>
+</li>
+<li>get_item_ident()
+: <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a4420d6acf6ba2f3723c655251b12abef">Redmatrix\Import\Import</a>
+</li>
+<li>get_itemlist()
+: <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a1af46c9f88257635f362d6027ea710c3">Redmatrix\Import\Import</a>
+</li>
<li>get_markup_template()
: <a class="el" href="interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442">ITemplateEngine</a>
, <a class="el" href="classFriendicaSmartyEngine.html#aab5994077fc3a64222e41b28e2bd8d88">FriendicaSmartyEngine</a>
@@ -239,6 +252,9 @@ $(document).ready(function(){initNavTree('functions_func_0x67.html','');});
<li>get_redirect_url()
: <a class="el" href="classItem.html#a428f448f89a8629055ea3294eb942aea">Item</a>
</li>
+<li>get_taxonomy()
+: <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#ab1e4a1d404b5a5a9c518c205d1428154">Redmatrix\Import\Import</a>
+</li>
<li>get_template()
: <a class="el" href="classItem.html#aba23a0a9d89e316d2b343cc46d695d91">Item</a>
</li>
@@ -289,17 +305,17 @@ $(document).ready(function(){initNavTree('functions_func_0x67.html','');});
: <a class="el" href="classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468">photo_driver</a>
</li>
<li>getImage()
-: <a class="el" href="classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484">photo_gd</a>
-, <a class="el" href="classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc">photo_imagick</a>
+: <a class="el" href="classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc">photo_imagick</a>
+, <a class="el" href="classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484">photo_gd</a>
, <a class="el" href="classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5">photo_driver</a>
</li>
<li>getLastModified()
-: <a class="el" href="classRedMatrix_1_1RedDAV_1_1RedFile.html#ac47016aa0e3f6f1a1c4570bd6fd8cf25">RedMatrix\RedDAV\RedFile</a>
-, <a class="el" href="classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db5f641f8f5dc999e55cee1832ecd5">RedMatrix\RedDAV\RedDirectory</a>
+: <a class="el" href="classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db5f641f8f5dc999e55cee1832ecd5">RedMatrix\RedDAV\RedDirectory</a>
+, <a class="el" href="classRedMatrix_1_1RedDAV_1_1RedFile.html#ac47016aa0e3f6f1a1c4570bd6fd8cf25">RedMatrix\RedDAV\RedFile</a>
</li>
<li>getName()
-: <a class="el" href="classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a55f7172814a0749b5342f152ab3fa0df">RedMatrix\RedDAV\RedDirectory</a>
-, <a class="el" href="classRedMatrix_1_1RedDAV_1_1RedFile.html#ac945aa782d6c035d339e59974266ec4d">RedMatrix\RedDAV\RedFile</a>
+: <a class="el" href="classRedMatrix_1_1RedDAV_1_1RedFile.html#ac945aa782d6c035d339e59974266ec4d">RedMatrix\RedDAV\RedFile</a>
+, <a class="el" href="classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a55f7172814a0749b5342f152ab3fa0df">RedMatrix\RedDAV\RedDirectory</a>
</li>
<li>getQuotaInfo()
: <a class="el" href="classRedMatrix_1_1RedDAV_1_1RedDirectory.html#a69db443ed3c84938b4352fe515bf8d68">RedMatrix\RedDAV\RedDirectory</a>