add merge changelog and version

TarsCloud · Jun 15, 2020 · 2ef4386 · 2ef4386
1 parent 876919c
commit 2ef4386
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.4 (2020/06/15)
+### ChangLogs
+- merge from feature/tars-gateway branch (add tup && json protocol support)
+
+
 ## 1.1.3 (2020/06/02)
 ### ChangLogs
 - fixed RequestPacket not set timeout bug

diff --git a/tars/tools/tars2go/version.go b/tars/tools/tars2go/version.go
@@ -1,4 +1,4 @@
 package main
 
 //VERSION version of the tars2go tools.
-const VERSION = "1.1"
+const VERSION = "1.1.4"