Bump version

Signed-off-by: Vitor Mattos <[email protected]>
LibreCodeCoop · Feb 24, 2024 · 429ee4d · 429ee4d
1 parent 7b39bd4
commit 429ee4d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,10 +13,11 @@ Types of changes:
 - *Security* in case of vulnerabilities. 
 
 <!-- changelog-linker -->
-## 2.1.0.dev - 2023-08-30
+## 2.0.0 - 2024-02-24
 
 ### Changed
-- first changelog compatible with server 28
+- Compatible with server 28
+- Update dependencies
 
 ## 1.0.1 - 2023-08-30
 

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -21,7 +21,11 @@ To more informations about how this app works or to get examples, look at the ad
 
 	]]>
 	</description>
+<<<<<<< HEAD
 	<version>2.1.0</version>
+=======
+	<version>2.0.0</version>
+>>>>>>> 9d9ccb8 (Bump version)
 	<licence>agpl</licence>
 	<author mail="[email protected]" homepage="https://librecode.coop">LibreCode</author>
 	<namespace>L10nOverride</namespace>