Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Mon, 26 Mar 2018 06:23:50 +0000
changeset 33744 3ee6ba66926c
parent 33729 c4b4d8db38fa (current diff)
parent 33743 9513c49c2229 (diff)
child 33745 5a2eed8a9dad
child 33750 7cb2e8e06823
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Fri Mar 23 20:13:34 2018 +0000
+++ b/.hgsigs	Mon Mar 26 06:23:50 2018 +0000
@@ -225,4 +225,5 @@
 2e43174aba46ec6956a0e703bbb9bee5292c871a 0 iEYEABECAAYFAlpuyUwACgkQCX/oGf+2qkPuJgCePIRg5ennwj6kgpOnyxZCPUV54Y0Ani30NnQNuNkXNkBMyykw2JfW21Vs
 43d95f7cb67084eb978752359847ab28b9aa14f6 0 iEYEABECAAYFAlpEpSMACgkQCX/oGf+2qkNdMACdGNGo6rpHht3lNH3FmwtsNcIe65sAn1sM9rBx/Sm3ytwcL2C5irUyD05J
 2ed90e80323f7bf5245be3946e2f60ea68d30f6e 0 iEYEABECAAYFAlqFgUsACgkQCX/oGf+2qkMGWwCg9AesP/a8fHuHrGVkUZcGk0x8CSgAniD73vR4fZ3uaU1eqtQr9HYlwpCQ
+f06ec509f2bf413f13d422e937ec12531fe1821a 0 iEYEABECAAYFAlqzgcwACgkQCX/oGf+2qkP/EACeJH+QthNIdldCdTvfnllHXTXDo24AnRVV1DveMhhNbgb50zu8ETDZ1WVT
 b90f619fc9f3f9ca6439969e99f742f9a9403f82 0 iEYEABECAAYFAlqMGfIACgkQCX/oGf+2qkPjiQCgyYNqJlbSOSoax5ydjqpJKun85RIAoM9s2iEyLfJ8CJyfUXFmz6FtvmqC
--- a/.hgtags	Fri Mar 23 20:13:34 2018 +0000
+++ b/.hgtags	Mon Mar 26 06:23:50 2018 +0000
@@ -236,4 +236,5 @@
 dd65065492e55421c107be4c87894a508bb1244d 3.0PR17Q3.3
 a8b6912d30a34e4a7d0873fc0fe53df228417b49 3.0PR17Q4
 82be2c7d9d11d77238355e65724408b6c5aa2ffb 3.0PR17Q4.1
+7b0d4c95c2b308cd1b12dcfbe2a36c7f77fb49a4 3.0PR17Q4.2
 46184d2680e43a9b29d3058a75dea7d15d47b4b4 3.0PR18Q1