Merge branch 'master' into tres

Conflicts:
	mod/events.php
	view/css/mod_events.css

1 files changed, 9 insertions, 0 deletions

diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js
index 853dd12ae..e0761d586 100644
--- a/doc/html/search/functions_72.js
+++ b/doc/html/search/functions_72.js
@@ -3,11 +3,19 @@ var searchData=
   ['random_5fprofile',['random_profile',['../Contact_8php.html#a7e3f5bef8ea1d2bf8434c9be36a2b713',1,'Contact.php']]],
   ['random_5fstring',['random_string',['../text_8php.html#a9d6a5ee1290de7a8b483fe78585daade',1,'text.php']]],
   ['randprof_5finit',['randprof_init',['../randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090',1,'randprof.php']]],
+  ['rate_5fcontent',['rate_content',['../rate_8php.html#a22fc66202522acb53fb3746fc21d80f2',1,'rate.php']]],
+  ['rate_5finit',['rate_init',['../rate_8php.html#a051f31f49e9decd6d701bc5ab8fb7771',1,'rate.php']]],
+  ['rate_5fpost',['rate_post',['../rate_8php.html#acae9f41835b07e3c977464030e8831fc',1,'rate.php']]],
+  ['ratenotif_5frun',['ratenotif_run',['../ratenotif_8php.html#a0dd7843f7f10ba9ea29bcbdff1cdbf37',1,'ratenotif.php']]],
+  ['ratings_5fcontent',['ratings_content',['../ratings_8php.html#a25f835d136b884354cf1fa4d897c857b',1,'ratings.php']]],
+  ['ratings_5finit',['ratings_init',['../ratings_8php.html#abcfe38319c4e66eb70a687ecc2966ac3',1,'ratings.php']]],
+  ['ratingsearch_5finit',['ratingsearch_init',['../ratingsearch_8php.html#aa609eb568ce273ef08e04a39ee532466',1,'ratingsearch.php']]],
   ['rbmark_5fcontent',['rbmark_content',['../rbmark_8php.html#a43fec4960b50926251574762cc491f76',1,'rbmark.php']]],
   ['rbmark_5fpost',['rbmark_post',['../rbmark_8php.html#ac5a66aa8599fa5dc702bae396d8d1f8c',1,'rbmark.php']]],
   ['rconnect_5furl',['rconnect_url',['../Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91',1,'Contact.php']]],
   ['rebuild_5ftheme_5ftable',['rebuild_theme_table',['../admin_8php.html#ae46311a3fefc21abc838a26e91789de6',1,'admin.php']]],
   ['receive_5fpost',['receive_post',['../receive_8php.html#a03d8fa26e77844020ba5602deca7d494',1,'receive.php']]],
+  ['recursive_5factivity_5frecipients',['recursive_activity_recipients',['../include_2attach_8php.html#aabd15487fa0e5d2dc5c480f72d23b886',1,'attach.php']]],
   ['red_5fescape_5fcodeblock',['red_escape_codeblock',['../items_8php.html#a49905ea75adfe8a2d110be344d18d6a6',1,'items.php']]],
   ['red_5fescape_5fzrl_5fcallback',['red_escape_zrl_callback',['../items_8php.html#a83a349062945d585edb4b3c5d763ab6e',1,'items.php']]],
   ['red_5fitem_5fnew',['red_item_new',['../include_2api_8php.html#aafa82b65a9f879a1a1197cfe8aaf3898',1,'api.php']]],
@@ -32,6 +40,7 @@ var searchData=
   ['reflect_5ffind_5fuser',['reflect_find_user',['../refimport_8php.html#aa98de7d112e3a5b4b6956f108d04a41d',1,'refimport.php']]],
   ['reflect_5fget_5fchannel',['reflect_get_channel',['../refimport_8php.html#a6c3e0475fde9fe72ff2492a5e3e5259c',1,'refimport.php']]],
   ['reflect_5fphoto_5fcallback',['reflect_photo_callback',['../refimport_8php.html#ae9c56f779d1e0ac7bcb2a460129e7ae5',1,'refimport.php']]],
+  ['regdir_5finit',['regdir_init',['../regdir_8php.html#a6e703a4e66d2370c48500262cc0b56dd',1,'regdir.php']]],
   ['register_5fcontent',['register_content',['../register_8php.html#a0e91f57f111407ea8d3223a05022bb2a',1,'register.php']]],
   ['register_5fhook',['register_hook',['../plugin_8php.html#a425472c5f3afc137268b2ad45652b209',1,'plugin.php']]],
   ['register_5finit',['register_init',['../register_8php.html#ae20c0cd40f738d6295de58b9202c83d5',1,'register.php']]],