From fca24611163bbf16d665b83c20dbda5119eafb07 Mon Sep 17 00:00:00 2001
From: dataegg <dxdroid@gmail.com>
Date: Fri, 3 Jan 2020 22:20:21 +0800
Subject: [PATCH] 3.12.4

---
 README.md         | 2 +-
 doc/en/patches.md | 5 +++++
 doc/zh/README.md  | 2 +-
 doc/zh/patches.md | 5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 65025ff..b424c50 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This is the documentation of FeedMe.
 
 ## Version:
 - release: 3.12.2
-- beta: 3.12.3 (join beta test: https://play.google.com/apps/testing/com.seazon.feedme)
+- beta: 3.12.4 (join beta test: https://play.google.com/apps/testing/com.seazon.feedme)
 
 ## Download:
 - https://play.google.com/store/apps/details?id=com.seazon.feedme
diff --git a/doc/en/patches.md b/doc/en/patches.md
index 6e34f9a..c445929 100644
--- a/doc/en/patches.md
+++ b/doc/en/patches.md
@@ -1,3 +1,8 @@
+### 3.12.4
+###### 2020-1-3
+- [optimize]`Decode HTML` adds a global default value(in settings - sync - advanced).
+- [fix]Fix sync failed issue.
+
 ### 3.12.3
 ###### 2019-12-30
 - [optimize]Support add feed url directly.
diff --git a/doc/zh/README.md b/doc/zh/README.md
index ce62673..6721562 100644
--- a/doc/zh/README.md
+++ b/doc/zh/README.md
@@ -12,7 +12,7 @@ FeedMe是一个RSS阅读器，支持以下RSS服务：
 
 ## 版本:
 - 正式: 3.12.2
-- 测试: 3.12.3 (加入beta测试: https://play.google.com/apps/testing/com.seazon.feedme)
+- 测试: 3.12.4 (加入beta测试: https://play.google.com/apps/testing/com.seazon.feedme)
 
 ## 下载:
 - https://play.google.com/store/apps/details?id=com.seazon.feedme
diff --git a/doc/zh/patches.md b/doc/zh/patches.md
index ce0e2c6..b36f177 100644
--- a/doc/zh/patches.md
+++ b/doc/zh/patches.md
@@ -1,3 +1,8 @@
+### 3.12.4
+###### 2020-1-3
+- [优化]订阅源HTML转码选项添加全局默认值（在设置-同步-高级中）。
+- [修复]修复同步失败问题。
+
 ### 3.12.3
 ###### 2019-12-30
 - [优化]添加订阅源现在可以直接添加url了。