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_func_0x73.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_func_0x73.html')
| -rw-r--r-- | doc/html/functions_func_0x73.html | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/doc/html/functions_func_0x73.html b/doc/html/functions_func_0x73.html index 80016b95c..be0ab7e00 100644 --- a/doc/html/functions_func_0x73.html +++ b/doc/html/functions_func_0x73.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> @@ -180,12 +180,6 @@ $(document).ready(function(){initNavTree('functions_func_0x73.html','');}); <li>set_conversation() : <a class="el" href="classItem.html#aa8b1bbc4236890694635295e46d7fd72">Item</a> </li> -<li>set_curl_code() -: <a class="el" href="classApp.html#a5e6a6bd641e4d9909df56f0283c03821">App</a> -</li> -<li>set_curl_headers() -: <a class="el" href="classApp.html#a9632092d9e8fdaa82a9fc4586433fd31">App</a> -</li> <li>set_groups() : <a class="el" href="classApp.html#a3d84af5e42082098672531cd1a618853">App</a> </li> @@ -234,9 +228,9 @@ $(document).ready(function(){initNavTree('functions_func_0x73.html','');}); : <a class="el" href="classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b">photo_driver</a> </li> <li>supportedTypes() -: <a class="el" href="classphoto__driver.html#a6eee8e36eaf9339f4faf80ddd43162da">photo_driver</a> +: <a class="el" href="classphoto__imagick.html#a27596faca6108d9d563674d1b654a0b7">photo_imagick</a> +, <a class="el" href="classphoto__driver.html#a6eee8e36eaf9339f4faf80ddd43162da">photo_driver</a> , <a class="el" href="classphoto__gd.html#a16f3dd7d3559f715aa2fe3f7880836dd">photo_gd</a> -, <a class="el" href="classphoto__imagick.html#a27596faca6108d9d563674d1b654a0b7">photo_imagick</a> </li> </ul> </div><!-- contents --> |