Merge branch 'dev' into 'dev'

# Conflicts:
#   Zotlabs/Lib/ThreadItem.php

1 files changed, 5 insertions, 6 deletions

diff --git a/vendor/sabre/vobject/lib/Settings.php b/vendor/sabre/vobject/lib/Settings.php
index 3f274ba8e..afc586b0c 100644
--- a/vendor/sabre/vobject/lib/Settings.php
+++ b/vendor/sabre/vobject/lib/Settings.php
@@ -15,8 +15,8 @@ namespace Sabre\VObject;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Settings {
-
+class Settings
+{
     /**
      * The minimum date we accept for various calculations with dates, such as
      * recurrences.
@@ -25,7 +25,7 @@ class Settings {
      * use-cases. In particular, it covers birthdates for virtually everyone
      * alive on earth, which is less than 5 people at the time of writing.
      */
-    static $minDate = '1900-01-01';
+    public static $minDate = '1900-01-01';
 
     /**
      * The maximum date we accept for various calculations with dates, such as
@@ -34,7 +34,7 @@ class Settings {
      * The choice of 2100 is pretty arbitrary, but should cover most
      * appointments made for many years to come.
      */
-    static $maxDate = '2100-01-01';
+    public static $maxDate = '2100-01-01';
 
     /**
      * The maximum number of recurrences that will be generated.
@@ -51,6 +51,5 @@ class Settings {
      *
      * Set this value to -1 to disable this control altogether.
      */
-    static $maxRecurrences = 3500;
-
+    public static $maxRecurrences = 3500;
 }