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/widgets_8php.js | |
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/widgets_8php.js')
-rw-r--r-- | doc/html/widgets_8php.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/html/widgets_8php.js b/doc/html/widgets_8php.js index f78b49912..a9a232e73 100644 --- a/doc/html/widgets_8php.js +++ b/doc/html/widgets_8php.js @@ -26,6 +26,7 @@ var widgets_8php = [ "widget_photo_rand", "widgets_8php.html#af8eb466ef91d9e96e13335ead5eba380", null ], [ "widget_profile", "widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923", null ], [ "widget_random_block", "widgets_8php.html#a829c5a5c7448129266fc1df3ae1a3c2e", null ], + [ "widget_rating", "widgets_8php.html#a7d0724165067077ff46484e4610e4323", null ], [ "widget_savedsearch", "widgets_8php.html#a94203eb9bcd63cbdecbbcb15163598d8", null ], [ "widget_settings_menu", "widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01", null ], [ "widget_suggestedchats", "widgets_8php.html#a50b1410238100c8a94c06b0aa63ee3b8", null ], |