Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 31 Oct 2018 05:07:53 +0000
changeset 34975 2ae28dc87483
parent 34974 442d564cc845 (current diff)
parent 34840 f8e6bc79543a (diff)
child 34976 7ba289b96606
Merge back from main
modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
src-core/src/org/openbravo/database/ExternalConnectionPool.java
src-db/database/model/prescript-PostgreSql.sql
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
--- a/.hgsigs	Tue Oct 30 13:58:35 2018 +0100
+++ b/.hgsigs	Wed Oct 31 05:07:53 2018 +0000
@@ -233,5 +233,6 @@
 2121d856284cf0c4f26faef336bd2aa41ada151f 0 iEYEABECAAYFAlr8AykACgkQCX/oGf+2qkPKhQCfeQ+9S16IA3wZMgnoJjRRZRvG8SUAoIgKQPopjsjObnB6Qu1DyNgCByRt
 faeac12b1aad3dc7fb53f8ffda3ada9e3b7deaeb 0 iEYEABECAAYFAls/boQACgkQCX/oGf+2qkNdfACfaNh5oqLf0LzgGAYLmRWa97kbFj4AoL3KPdVDG0Mf6qKcxejAl7Kl12cd
 69fa322764529bb77cd3ef3b7b5dd33f6667e560 0 iEYEABECAAYFAlt1MD4ACgkQCX/oGf+2qkPU4wCgnCdQrG3eWxbDWbitjSsm6XvbQ6IAni9v1H03pkrhgPmaS97Ft9MOHVhO
+a3dec60771dbfb34de34e735d05f10fa7a0ba7f7 0 iEYEABECAAYFAlvW4j8ACgkQCX/oGf+2qkMXngCgktuuCJKOHrfxbcd0/Y89CN/NGP0AnAv1h6DqduuUlId9b288f61gCaZ2
 bbb6e342b4af3c81bd1a49418a01e63fcb09e3c5 0 iEYEABECAAYFAltpYMEACgkQCX/oGf+2qkMblgCffRsYLqTbeixIj19Lm3dm6iMqkv0AoM3iSQaEFeV7ff9nYRd3vz227Ir6
 51e0d0e9566b3a1e0e7e08e8bd089b77ae779688 0 iEYEABECAAYFAlukneUACgkQCX/oGf+2qkP8ngCgiC3Jo4cDL8F35HXpqHL3QtD46kUAn0znm6h/Ad3r0f/rJXf6dJli+zjK
--- a/.hgtags	Tue Oct 30 13:58:35 2018 +0100
+++ b/.hgtags	Wed Oct 31 05:07:53 2018 +0000
@@ -244,5 +244,6 @@
 63c5e173ffdca0828d75476e5a48e2fae42ad9e9 3.0PR18Q1.3
 3f281a901fbbde5103faebca4df0c22b94ac5535 3.0PR18Q2.1
 72cf5779eb218bb25914b1aadade7fde01c67842 3.0PR18Q2.2
+26a3469df96bb87c3517889ba412bde73f17f3f7 3.0PR18Q2.3
 5cbef591aff09f80e8a73a92202d438b792ad40f 3.0PR18Q3
 2f706d7a458e736b7b6add7ca445132c5e0b9758 3.0PR18Q3.1