Version 1.23

MircoBabin · Feb 7, 2024 · ff991e4 · ff991e4
1 parent fad1fcd
commit ff991e4
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # GitNoob changelog
 
+## Version 1.23
+* Add: option to start DOS Prompt when a merge, rebase, cherry pick conflict arises.
+* Add: Edit GitNoob root configuration file.
+* Fix: cherry pick conflict.
+* Fix: rebase conflict.
+* Fix: tests
+
 ## Version 1.22
 * Fix: reset abandoned lock.
 

diff --git a/assets/Release/GitNoob-1.22-debugpack.zip b/assets/Release/GitNoob-1.22-debugpack.zip
diff --git a/assets/Release/GitNoob-1.22.zip b/assets/Release/GitNoob-1.22.zip
diff --git a/assets/Release/GitNoob-1.23-debugpack.zip b/assets/Release/GitNoob-1.23-debugpack.zip
diff --git a/assets/Release/GitNoob-1.23.zip b/assets/Release/GitNoob-1.23.zip
diff --git a/assets/Release/release.download.zip.url-location b/assets/Release/release.download.zip.url-location
@@ -1 +1 @@
-https://github.com/MircoBabin/GitNoob/releases/download/1.22/GitNoob-1.22.zip
+https://github.com/MircoBabin/GitNoob/releases/download/1.23/GitNoob-1.23.zip
diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs
@@ -22,5 +22,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.22")]
-[assembly: AssemblyFileVersion("1.22")]
+[assembly: AssemblyVersion("1.23")]
+[assembly: AssemblyFileVersion("1.23")]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		https://github.com/MircoBabin/GitNoob/releases/download/1.22/GitNoob-1.22.zip
		https://github.com/MircoBabin/GitNoob/releases/download/1.23/GitNoob-1.23.zip