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/functions_0x63.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/functions_0x63.html')
| -rw-r--r-- | doc/html/functions_0x63.html | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/doc/html/functions_0x63.html b/doc/html/functions_0x63.html index 2ee7151e5..9a468900b 100644 --- a/doc/html/functions_0x63.html +++ b/doc/html/functions_0x63.html @@ -167,10 +167,19 @@ $(document).ready(function(){initNavTree('functions_0x63.html','');}); , <a class="el" href="classZotDriver.html#a2e15ff09772f0608203dad1c98299394">ZotDriver</a> </li> <li>connect() -: <a class="el" href="classdba__driver.html#ae533e62a240a793f17aef5ab4ef10edc">dba_driver</a> -, <a class="el" href="classdba__mysqli.html#add062bd93961e5f0194d94820e9a51b1">dba_mysqli</a> +: <a class="el" href="classdba__mysqli.html#add062bd93961e5f0194d94820e9a51b1">dba_mysqli</a> +, <a class="el" href="classdba__driver.html#ae533e62a240a793f17aef5ab4ef10edc">dba_driver</a> , <a class="el" href="classdba__mysql.html#a1887338627ce0e28786839363014bd0b">dba_mysql</a> </li> +<li>convert_child() +: <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#ad9c6677ea07c496d81914b97aeb5fba5">Redmatrix\Import\Import</a> +</li> +<li>convert_item() +: <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#add4d39232c883b59634595be14441336">Redmatrix\Import\Import</a> +</li> +<li>convert_taxonomy() +: <a class="el" href="classRedmatrix_1_1Import_1_1Import.html#a5a54b41c30aed8ac9ca6e486fd0b4b97">Redmatrix\Import\Import</a> +</li> <li>count_descendants() : <a class="el" href="classItem.html#aca1e66988ed00cd627b2a359b72cd0ae">Item</a> </li> |