Merge branch 'dev' into 'dev'

# Conflicts:
#   Zotlabs/Lib/ThreadItem.php

1 files changed, 4 insertions, 8 deletions

diff --git a/vendor/sabre/vobject/lib/Property/FlatText.php b/vendor/sabre/vobject/lib/Property/FlatText.php
index 2c7b43c29..d15cfe051 100644
--- a/vendor/sabre/vobject/lib/Property/FlatText.php
+++ b/vendor/sabre/vobject/lib/Property/FlatText.php
@@ -22,8 +22,8 @@ namespace Sabre\VObject\Property;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class FlatText extends Text {
-
+class FlatText extends Text
+{
     /**
      * Field separator.
      *
@@ -37,14 +37,10 @@ class FlatText extends Text {
      * Overriding this so we're not splitting on a ; delimiter.
      *
      * @param string $val
-     *
-     * @return void
      */
-    function setQuotedPrintableValue($val) {
-
+    public function setQuotedPrintableValue($val)
+    {
         $val = quoted_printable_decode($val);
         $this->setValue($val);
-
     }
-
 }