diff options
author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
---|---|---|
committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
commit | 870df76463a1cc9823b364db0bfb387f3f46664f (patch) | |
tree | a8c7391bfe799703aa0a8f26b9ee788f1204e8be /doc/html/functions_0x67.html | |
parent | 25a533bd72c34e9775af71c010a39db6caf7b633 (diff) | |
parent | 7e7b5bfa4930493a8feae10b0550e29797956c70 (diff) | |
download | volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.gz volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.bz2 volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.zip |
Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts:
view/php/theme_init.php
Diffstat (limited to 'doc/html/functions_0x67.html')
-rw-r--r-- | doc/html/functions_0x67.html | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/doc/html/functions_0x67.html b/doc/html/functions_0x67.html index 7197b42f9..65da95e12 100644 --- a/doc/html/functions_0x67.html +++ b/doc/html/functions_0x67.html @@ -28,7 +28,7 @@ <table cellspacing="0" cellpadding="0"> <tbody> <tr style="height: 56px;"> - <td id="projectlogo"><img alt="Logo" src="rhash-64.png"/></td> + <td id="projectlogo"><img alt="Logo" src="rm-64.png"/></td> <td style="padding-left: 0.5em;"> <div id="projectname">The Red Matrix </div> @@ -179,12 +179,6 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');}); <li>get_conversation() : <a class="el" href="classItem.html#a0c301aaed2b7d682728d18db3a22afa3">Item</a> </li> -<li>get_curl_code() -: <a class="el" href="classApp.html#ab410451f132910773d0a02e35d0dced9">App</a> -</li> -<li>get_curl_headers() -: <a class="el" href="classApp.html#abaf2173711e861ae4aebf43a7f70157e">App</a> -</li> <li>get_data() : <a class="el" href="classItem.html#ad3638f93065693c1f69eb349feb1b7aa">Item</a> </li> @@ -283,9 +277,9 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');}); : <a class="el" href="classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468">photo_driver</a> </li> <li>getImage() -: <a class="el" href="classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5">photo_driver</a> +: <a class="el" href="classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc">photo_imagick</a> +, <a class="el" href="classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5">photo_driver</a> , <a class="el" href="classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484">photo_gd</a> -, <a class="el" href="classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc">photo_imagick</a> </li> <li>getLastModified() : <a class="el" href="classRedInode.html#a8503d4f247186e9e55bc42b37e067fb6">RedInode</a> |