diff options
| author | friendica <info@friendica.com> | 2015-02-08 20:57:37 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-08 20:57:37 -0800 |
| commit | 08b757a22cd2804bfec8ecf682b6987b8c06ca49 (patch) | |
| tree | 477f3a8e84388aab2a4f3c938a166597c7467d19 /doc/html/dir_d44c64559bbebec7f509842c48db8b23.html | |
| parent | 4b348d248975ba07ba9cea62f51eb52d6afb5645 (diff) | |
| parent | 247579ebf13ead372eee87bd2351078f7219321e (diff) | |
| download | volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.tar.gz volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.tar.bz2 volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.zip | |
Merge branch 'master' into tres
Conflicts:
mod/events.php
view/css/mod_events.css
Diffstat (limited to 'doc/html/dir_d44c64559bbebec7f509842c48db8b23.html')
| -rw-r--r-- | doc/html/dir_d44c64559bbebec7f509842c48db8b23.html | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html index 538c6c7a9..8247cd8c8 100644 --- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html +++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html @@ -254,6 +254,8 @@ Files</h2></td></tr> <tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr> <tr class="memitem:queue__fn_8php"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="queue__fn_8php.html">queue_fn.php</a></td></tr> <tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr> +<tr class="memitem:ratenotif_8php"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="ratenotif_8php.html">ratenotif.php</a></td></tr> +<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr> <tr class="memitem:reddav_8php"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="reddav_8php.html">reddav.php</a></td></tr> <tr class="memdesc:reddav_8php"><td class="mdescLeft"> </td><td class="mdescRight">some DAV related functions for <a class="el" href="namespaceRedMatrix.html" title="Class Import.">RedMatrix</a>. <br/></td></tr> <tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr> |