Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 08 Nov 2019 06:58:19 +0000
changeset 36733 ae8a9b5dd30f
parent 36726 20fcab3e0379 (current diff)
parent 36732 d5bf8ecae79a (diff)
child 36734 613cc41c0e8b
Merge back from main
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Wed Oct 30 22:02:25 2019 -0300
+++ b/.hgsigs	Fri Nov 08 06:58:19 2019 +0000
@@ -253,3 +253,4 @@
 3e6de99a50604bf1817e3e509dd1b26a9dddd96a 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXY3hHQAKCRAJf+gZ/7aqQ3WjAJ4ydw4yhZFc757DHRiA0HfyWDMl5wCeLtYUOMAdlCKOOzf5pGGoWJM/7fU=
 141ce2831a2318a095a2db263f1dc041ae31f850 0 iFwEABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXVzM7wAKCRAJf+gZ/7aqQwUGAJjl80f+aW3QMjFZsDptNJM/oeYSAJ9Slfrt5/iIZ8XTC0t8rnNbdb9Ihg==
 ba61eb73dbd816a69f6d060cf92ec944420e8fb7 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXY3/bwAKCRAJf+gZ/7aqQ1anAKD2x0q55rTlHOeJge+5FUmbQ4AUvQCcDd/NTdSk9mgwLR1m9x22vviyuo8=
+240f11a1fce7839acf3bbcddf77b0fb2bd19e412 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXcPl8AAKCRAJf+gZ/7aqQ1tlAKClM8vlvhtTPeDUjzdPZjvI9/1EGACgqDQ1HV9CpWVokqZboYfIJJ7e7E0=
--- a/.hgtags	Wed Oct 30 22:02:25 2019 -0300
+++ b/.hgtags	Fri Nov 08 06:58:19 2019 +0000
@@ -264,3 +264,4 @@
 9a99482178d152b245851b965ee71ebb7471f79c 3.0PR19Q2.3
 bda45dd2e1704d61971095da67836a3b2894e73d 3.0PR19Q3
 921035308d3805140861f213b50b10ea056775cc 3.0PR19Q3.1
+fbeebc51d2541bb995b6caddf559ad25dddcbf62 3.0PR19Q3.2