Merge remote-tracking branch 'origin/unstable' into testing testing github/testing
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 24 Nov 2021 09:06:29 +0000 (10:06 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 24 Nov 2021 09:06:29 +0000 (10:06 +0100)
1  2 
lib/pom.xml
pom.xml

diff --cc lib/pom.xml
index 5611ecf11b2e956f9b8c0d22509d86ba806ad0a7,96f8b17125e20a1aef7c6ef173fac09e58fd20fd..bdda5d1bfff77163176d2687f1cc5b2c646c078a
@@@ -14,9 -14,8 +14,8 @@@
        <properties>
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>
-               <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
 -              <version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
 -              <version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
 +              <version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
 +              <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
                <git.rw />
        </properties>
        <dependencies>
diff --cc pom.xml
Simple merge