Merge branch 'master' into tres

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

1 files changed, 20 insertions, 20 deletions

diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js
index ee6fd29fb..95ed221b9 100644
--- a/doc/html/navtreeindex7.js
+++ b/doc/html/navtreeindex7.js
@@ -1,5 +1,8 @@
 var NAVTREEINDEX7 =
 {
+"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[6,0,1,54,0],
+"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[6,0,1,54,1],
+"magic_8php.html":[6,0,1,55],
 "magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[6,0,1,55,0],
 "mail_8php.html":[6,0,1,56],
 "mail_8php.html#a3c7c485fc69f92371e8b20936040eca1":[6,0,1,56,0],
@@ -64,8 +67,8 @@ var NAVTREEINDEX7 =
 "mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[6,0,1,80,2],
 "mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[6,0,1,80,0],
 "mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[6,0,1,80,1],
-"mod_2probe_8php.html":[6,0,1,90],
-"mod_2probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[6,0,1,90,0],
+"mod_2probe_8php.html":[6,0,1,89],
+"mod_2probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[6,0,1,89,0],
 "mod__chanview_8php.html":[6,0,3,1,0,0,0],
 "mod__import_8php.html":[6,0,3,0,4],
 "mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb":[6,0,3,0,4,0],
@@ -81,12 +84,12 @@ var NAVTREEINDEX7 =
 "namespaceFriendica.html":[4,0,1],
 "namespaceRedMatrix.html":[4,0,3],
 "namespaceRedMatrix.html":[5,0,3],
-"namespaceRedMatrix_1_1Import.html":[5,0,3,0],
 "namespaceRedMatrix_1_1Import.html":[4,0,3,0],
+"namespaceRedMatrix_1_1Import.html":[5,0,3,0],
 "namespaceRedMatrix_1_1RedDAV.html":[5,0,3,1],
 "namespaceRedMatrix_1_1RedDAV.html":[4,0,3,1],
-"namespaceacl__selectors.html":[4,0,0],
 "namespaceacl__selectors.html":[5,0,0],
+"namespaceacl__selectors.html":[4,0,0],
 "namespacefriendica-to-smarty-tpl.html":[4,0,2],
 "namespacefriendica-to-smarty-tpl.html":[5,0,2],
 "namespacemembers.html":[4,1,0],
@@ -95,8 +98,8 @@ var NAVTREEINDEX7 =
 "namespaces.html":[4,0],
 "namespaceupdatetpl.html":[5,0,4],
 "namespaceupdatetpl.html":[4,0,4],
-"namespaceutil.html":[4,0,5],
 "namespaceutil.html":[5,0,5],
+"namespaceutil.html":[4,0,5],
 "nav_8php.html":[6,0,0,53],
 "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[6,0,0,53,0],
 "nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[6,0,0,53,1],
@@ -232,22 +235,19 @@ var NAVTREEINDEX7 =
 "post_8php.html#af4b48181ce773ef0cdfc972441445c34":[6,0,1,86,0],
 "post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[6,0,1,86,1],
 "prate_8php.html":[6,0,1,87],
-"prate_8php.html#af0e041483d1c6451ef5ce5f295e1dbfd":[6,0,1,87,0],
-"prep_8php.html":[6,0,1,88],
-"prep_8php.html#a1889254cb50366e7d6637cf2bbb83799":[6,0,1,88,1],
-"prep_8php.html#a9a410206b7f229a4c3f6bdb2eb42690a":[6,0,1,88,0],
-"pretheme_8php.html":[6,0,1,89],
-"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[6,0,1,89,0],
-"profile_8php.html":[6,0,1,91],
-"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[6,0,1,91,0],
-"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[6,0,1,91,1],
-"profile__photo_8php.html":[6,0,1,92],
-"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[6,0,1,92,0],
-"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[6,0,1,92,1],
-"profile__photo_8php.html#a561103564199da56e58061a4196eb102":[6,0,1,92,2],
+"prate_8php.html#a39181c85d6c3f1567aba992c1ad90a4d":[6,0,1,87,0],
+"prate_8php.html#af0e041483d1c6451ef5ce5f295e1dbfd":[6,0,1,87,1],
+"pretheme_8php.html":[6,0,1,88],
+"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[6,0,1,88,0],
+"profile_8php.html":[6,0,1,90],
+"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[6,0,1,90,0],
+"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[6,0,1,90,1],
+"profile__photo_8php.html":[6,0,1,91],
+"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[6,0,1,91,0],
+"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[6,0,1,91,1],
+"profile__photo_8php.html#a561103564199da56e58061a4196eb102":[6,0,1,91,2],
 "profile__selectors_8php.html":[6,0,0,67],
 "profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[6,0,0,67,4],
 "profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[6,0,0,67,2],
-"profile__selectors_8php.html#a8bfa1ca2d1598a3d65f1f9bb803ca816":[6,0,0,67,1],
-"profile__selectors_8php.html#ab0eae5c0ceba77364469f0f580f0d074":[6,0,0,67,5]
+"profile__selectors_8php.html#a8bfa1ca2d1598a3d65f1f9bb803ca816":[6,0,0,67,1]
 };