Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 27 Jan 2017 09:31:45 +0100
changeset 31305 9548d0903c6d
parent 31294 356f374645a1 (current diff)
parent 31304 21d052f37ed3 (diff)
child 31306 7bd93800da74
Merge back from main
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Fri Jan 27 01:44:41 2017 +0100
+++ b/.hgsigs	Fri Jan 27 09:31:45 2017 +0100
@@ -204,5 +204,7 @@
 b79e30a5b3532f45101cedce0f3bb6b0a86b5780 0 iEYEABECAAYFAlfz21YACgkQCX/oGf+2qkMqZgCgodjBPp4aS6GrpBTpumtr8DsFNAYAmwS3mdHHNYX8g8y4yIwjMDzmQG+o
 892fdbc643c7c5c52298aae76502ab2283a32433 0 iEYEABECAAYFAlg0JDIACgkQCX/oGf+2qkM+5gCeMkJ6j6tr/FN8cPHlBLGdnf/6F08AoNBmFRFQ/osVwBtifI+b3ZzXEx+X
 e03ab293da7be8c989b20cb7b1ecf4bbf3c7c990 0 iEYEABECAAYFAlh959EACgkQCX/oGf+2qkOFNwCgi/qs8UguivvKA1tlKRKQoIsQqDIAoOGm7DqYBaR6v3aZtvaLmdvffaUh
+81d470b918d385d47e958fe4c2d679cde07c9989 0 iEYEABECAAYFAliHS1kACgkQCX/oGf+2qkN/qgCeOAsukTY2FG0bVzdhXHw/K58kqlEAnAjixxvtQPM4PVmDYqzQDkGdqqtT
 555379f85b18b37ee1c36b4137c75eca80da7267 0 iEYEABECAAYFAlhSQ0UACgkQCX/oGf+2qkN2yQCg5zq8YEVnWK3wy859qvLYbrEhBY4AoKsfpep+GEj+oGGlmOiOqESGPxxH
 fa51600e25b24b2eb3739898d293168ea94748a7 0 iEYEABECAAYFAlh/u8wACgkQCX/oGf+2qkPTnwCfZ29b107GdizLBcC+tzdP3HlnmUUAoN2kMLXvfTYSRLAQG/ziGm5P6kYA
+9753e90ea3e81f850f904feb531120b4e185394a 0 iEYEABECAAYFAliG6A8ACgkQCX/oGf+2qkPeeQCg6D9p++eslvzqEVlYK8RS0uzgZNsAoMELVWkte/AM/ilPxZ4vP37myscv
--- a/.hgtags	Fri Jan 27 01:44:41 2017 +0100
+++ b/.hgtags	Fri Jan 27 09:31:45 2017 +0100
@@ -215,5 +215,7 @@
 f252db9dde915c15574e3d5fa505bd1154e39c74 3.0PR16Q3.2
 0c8c781e34c94d084b495d00a541d8d57a3903ea 3.0PR16Q3.3
 ed52b01e833ecc6407392f97ffd7d6531bd9bf2f 3.0PR16Q3.4
+ad0be95cec9715cc07fd82615c0de55f7c4a95b4 3.0PR16Q3.5
 cd98953b932b72cc3c694904fc8f8549463ba84a 3.0PR16Q4
 b93f495b2cde680cf6558d93d72051429f4b9031 3.0PR16Q4.1
+31c79a32ce3a6b555dadb35c70d63113be6312e7 3.0PR16Q4.2