Merge pull request #63 from nextcloud/update-stable12-target-versionsv1.2.4

Update stable12 target versions

6 files changed, 6 insertions, 6 deletions

diff --git a/.drone.yml b/.drone.yml
index a0bb2dd..e877445 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,7 +6,7 @@ pipeline:
     image: nextcloudci/php7.0:php7.0-2
     environment:
       - APP_NAME=files_accesscontrol
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable12
       - DB=sqlite
     commands:
       - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
diff --git a/.travis.yml b/.travis.yml
index a0a8f64..b0293da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ php:
 
 env:
   global:
-    - CORE_BRANCH=master
+    - CORE_BRANCH=stable12
     - APP_NAME=files_accesscontrol
   matrix:
     - DB=sqlite
diff --git a/Makefile b/Makefile
index b0ee6be..fb33046 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ source_dir=$(build_dir)/source
 sign_dir=$(build_dir)/sign
 package_name=$(app_name)
 cert_dir=$(HOME)/.nextcloud/certificates
-version+=1.2.3
+version+=1.2.4
 
 all: appstore
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 1b3886a..752882d 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,7 +6,7 @@
 	<description>Nextcloud's File Access Control app enables administrators to create and manage a set of rule groups. Each of the rule groups consists of one or more rules. If all rules of a group hold true, the group matches the request and access is being denied. The rules criteria range from IP address, to user groups, collaborative tags and some more.</description>
 	<licence>AGPL</licence>
 	<author>Morris Jobke</author>
-	<version>1.2.3</version>
+	<version>1.2.4</version>
 	<namespace>FilesAccessControl</namespace>
 
 	<category>files</category>
diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js
index 275ba77..e09159a 100644
--- a/l10n/zh_CN.js
+++ b/l10n/zh_CN.js
@@ -4,6 +4,6 @@ OC.L10N.register(
     "No rule given" : "没有定义规则",
     "File access control" : "文件访问控制",
     "Restrict access to files based on factors such as filetype, user group memberships, time and more." : "根据文件类型，用户组成员资格，时间等因素限制对文件的访问。",
-    "Each rule group consists of one or more rules. A request matches a group if all rules evaluate to true. If a request matches at least one of the defined groups, the request is blocked and the file content can not be read or written." : "每个规则组由一个或多个规则组成。 如果所有规则都匹配，则该请求匹配整个组。 如果请求与定义的组中至少一个匹配，则该请求被阻止，并且将无法读取或写入文件内容。"
+    "Each rule group consists of one or more rules. A request matches a group if all rules evaluate to true. If a request matches at least one of the defined groups, the request is blocked and the file content can not be read or written." : "每个规则组由一个或多个规则组成。 如果所有规则都匹配，则该请求匹配整个组。 如果请求与定义的组中至少一个匹配，则该请求被阻止，并且将无法读取或写入文件内容。"
 },
 "nplurals=1; plural=0;");
diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json
index 8e371e7..04c06fb 100644
--- a/l10n/zh_CN.json
+++ b/l10n/zh_CN.json
@@ -2,6 +2,6 @@
     "No rule given" : "没有定义规则",
     "File access control" : "文件访问控制",
     "Restrict access to files based on factors such as filetype, user group memberships, time and more." : "根据文件类型，用户组成员资格，时间等因素限制对文件的访问。",
-    "Each rule group consists of one or more rules. A request matches a group if all rules evaluate to true. If a request matches at least one of the defined groups, the request is blocked and the file content can not be read or written." : "每个规则组由一个或多个规则组成。 如果所有规则都匹配，则该请求匹配整个组。 如果请求与定义的组中至少一个匹配，则该请求被阻止，并且将无法读取或写入文件内容。"
+    "Each rule group consists of one or more rules. A request matches a group if all rules evaluate to true. If a request matches at least one of the defined groups, the request is blocked and the file content can not be read or written." : "每个规则组由一个或多个规则组成。 如果所有规则都匹配，则该请求匹配整个组。 如果请求与定义的组中至少一个匹配，则该请求被阻止，并且将无法读取或写入文件内容。"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file