Merge pull request #274 from ONLYOFFICE/develop

Release/2.3.1
ONLYOFFICE · Jun 24, 2019 · 5a55a72 · 5a55a72
2 parents 9b768ec + c67ebfe
commit 5a55a72
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.3.1
+## Added
+- editor customization
+
+## Changed
+- the settings page is splitted into two sections
+- support master key encryption
+
 ## 2.2.1
 ## Added
 - download permission

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -6,7 +6,7 @@
     <description>ONLYOFFICE connector enables you to edit Office documents within ONLYOFFICE from the familiar web interface. This will create a new Open in ONLYOFFICE action within the document library for Office documents. This allows multiple users to collaborate in real time and to save back those changes to your file storage.</description>
     <licence>agpl</licence>
     <author>Ascensio System SIA</author>
-    <version>2.2.1</version>
+    <version>2.3.1</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>

diff --git a/lib/documentservice.php b/lib/documentservice.php
@@ -343,7 +343,6 @@ function ProcessCommandServResponceError($errorCode) {
      *
      * @return string
      */
-
     public function Request($url, $method = "get", $opts = NULL) {
         $httpClientService = \OC::$server->getHTTPClientService();
         $client = $httpClientService->newClient();