Dev

appinfo/info.xml

@@ -26,7 +26,7 @@ If you require adaptations of this application to comply with your country's reg
 [![Donate](https://img.shields.io/badge/Donate-Buy%20me%20a%20coffee-yellow.svg)](https://www.buymeacoffee.com/benjaminaimard)
 
 ]]></description>
-    <version>2.8.7</version>
+    <version>2.8.8</version>
     <licence>agpl</licence>
     <author mail="benjamin@cybercorp.fr" homepage="https://github.com/baimard">Benjamin AIMARD</author>
     <namespace>Gestion</namespace>
@@ -49,7 +49,7 @@ If you require adaptations of this application to comply with your country's reg
     <screenshot>https://raw.githubusercontent.com/baimard/gestion/master/tests/Unit/Panther/screens/statistique.png</screenshot>
     <donation>https://www.buymeacoffee.com/benjaminaimard</donation>
     <dependencies>
-        <nextcloud min-version="30" max-version="31"/>
+        <nextcloud min-version="31" max-version="34"/>
         <php min-version="8"/>
     </dependencies>
     <settings>

templates/content/changelog.php

@@ -1,7 +1,11 @@
 <div syle="display: none;" id="modalConfig" class="modal">
 <div class="modal-content">
 	<span class="modalClose">&times;</span>
+<<<<<<< HEAD
+	<h2><?php p($l->t('Welcome to GESTION')); ?> 2.8.6</h2>
+=======
 	<h2><?php p($l->t('Welcome to GESTION')); ?> 2.8.7</h2>
+>>>>>>> 9dce8721ddae627aadb8395eeae9deaf706c1abc
 
 	<p style="font-size:14px;margin-bottom:20px;">
 		<?php p($l->t(