Merge branch 'master' into xx

This commit is contained in:
Bo-Yi Wu 2018-08-20 21:27:49 +08:00 committed by GitHub
commit ff341ce146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,4 +13,5 @@ var (
Marshal = json.Marshal
MarshalIndent = json.MarshalIndent
NewDecoder = json.NewDecoder
NewEncoder = json.NewEncoder
)