Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 02 Nov 2018 10:46:01 +0000
changeset 34978 388ac010944d
parent 34977 23b231580229 (current diff)
parent 34855 a757d80751c1 (diff)
child 34979 98b93929cdd3
child 35177 ab69a8924c33
Merge back from main
modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java
src-db/database/model/prescript-PostgreSql.sql
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
--- a/.hgsigs	Thu Nov 01 09:54:53 2018 +0100
+++ b/.hgsigs	Fri Nov 02 10:46:01 2018 +0000
@@ -236,3 +236,4 @@
 a3dec60771dbfb34de34e735d05f10fa7a0ba7f7 0 iEYEABECAAYFAlvW4j8ACgkQCX/oGf+2qkMXngCgktuuCJKOHrfxbcd0/Y89CN/NGP0AnAv1h6DqduuUlId9b288f61gCaZ2
 bbb6e342b4af3c81bd1a49418a01e63fcb09e3c5 0 iEYEABECAAYFAltpYMEACgkQCX/oGf+2qkMblgCffRsYLqTbeixIj19Lm3dm6iMqkv0AoM3iSQaEFeV7ff9nYRd3vz227Ir6
 51e0d0e9566b3a1e0e7e08e8bd089b77ae779688 0 iEYEABECAAYFAlukneUACgkQCX/oGf+2qkP8ngCgiC3Jo4cDL8F35HXpqHL3QtD46kUAn0znm6h/Ad3r0f/rJXf6dJli+zjK
+6a52d785570ecc2a63ba164aa50efa0b463917bd 0 iEYEABECAAYFAlvXCzAACgkQCX/oGf+2qkP3xQCgqKlwdDqMVRAsTFoEwi8gK16UtRIAnRVH6VaLpC/Yh7OgsjpO+rzj9AKp
--- a/.hgtags	Thu Nov 01 09:54:53 2018 +0100
+++ b/.hgtags	Fri Nov 02 10:46:01 2018 +0000
@@ -247,3 +247,4 @@
 26a3469df96bb87c3517889ba412bde73f17f3f7 3.0PR18Q2.3
 5cbef591aff09f80e8a73a92202d438b792ad40f 3.0PR18Q3
 2f706d7a458e736b7b6add7ca445132c5e0b9758 3.0PR18Q3.1
+b8cd708f773317970a8024f2e5b6c0ea4417e4b5 3.0PR18Q3.2