Merge pull request #1967 from slingamn/release

bump version and changelog for v2.10.0
ergochat · May 29, 2022 · e8cd87d · e8cd87d
2 parents acd95b9 + 101fd53
commit e8cd87d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,9 @@
 # Changelog
 All notable changes to Ergo will be documented in this file.
 
-## [2.10.0-rc2] - 2022-05-23
+## [2.10.0] - 2022-05-29
 
-Testing of 2.10.0-rc1 revealed serious bugs in the new `draft/read-marker` implementation. Consequently, we're publishing a second release candidate that fixes these issues. The final release is expected within a week or so; we apologize for the delay.
-
-### Fixed
-* Fixed bugs in the new `draft/read-marker` implementation (#1961, #1962)
-
-## [2.10.0-rc1] - 2022-05-16
-
-We're pleased to be publishing the release candidate for 2.10.0 (the official release should follow in a week or so).
+We're pleased to be publishing v2.10.0, a new stable release.
 
 This release contains no changes to the config file format or database file format.
 

diff --git a/irc/version.go b/irc/version.go
@@ -7,7 +7,7 @@ import "fmt"
 
 const (
 	// SemVer is the semantic version of Ergo.
-	SemVer = "2.10.0-rc2"
+	SemVer = "2.10.0"
 )
 
 var (
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ import "fmt" @@
     const (
     	// SemVer is the semantic version of Ergo.
-    	SemVer = "2.10.0-rc2"
+    	SemVer = "2.10.0"
     )
     var (
@@ Expand Down @@