Merge branch 'dev' into 'dev'

# Conflicts:
#   Zotlabs/Lib/ThreadItem.php

1 files changed, 6 insertions, 9 deletions

diff --git a/vendor/sabre/vobject/lib/Property/Unknown.php b/vendor/sabre/vobject/lib/Property/Unknown.php
index 7a3373868..6f404c286 100644
--- a/vendor/sabre/vobject/lib/Property/Unknown.php
+++ b/vendor/sabre/vobject/lib/Property/Unknown.php
@@ -12,8 +12,8 @@ namespace Sabre\VObject\Property;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Unknown extends Text {
-
+class Unknown extends Text
+{
     /**
      * Returns the value, in the format it should be encoded for json.
      *
@@ -21,10 +21,9 @@ class Unknown extends Text {
      *
      * @return array
      */
-    function getJsonValue() {
-
+    public function getJsonValue()
+    {
         return [$this->getRawMimeDirValue()];
-
     }
 
     /**
@@ -35,10 +34,8 @@ class Unknown extends Text {
      *
      * @return string
      */
-    function getValueType() {
-
+    public function getValueType()
+    {
         return 'UNKNOWN';
-
     }
-
 }