Merge branch 'master' into release-v1.0.14

josesimoes · web-flow · commit 9fae96386d9c · 2019-09-17T02:29:01.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -76,6 +76,7 @@
 
 **Documentation and other chores:**
 
+- Release v1.0.4 [\#31](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/31)
 - Bumps nanoFramework.CoreLibrary from 1.1.0 to 1.1.1 [\#30](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/30)
 - Merge back from Release v1.0.2 [\#29](https://github.com/nanoframework/lib-nanoFramework.Networking.Sntp/pull/29)
 
diff --git a/source/version.json b/source/version.json
@@ -20,4 +20,4 @@
     "branchName": "release-v{version}",
     "firstUnstableTag": "preview"
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,4 @@`
`20`	`20`	`"branchName": "release-v{version}",`
`21`	`21`	`"firstUnstableTag": "preview"`
`22`	`22`	`}`
`23`		`-}`
	`23`	`+}`