tree 16e4ad66854ce108ebd45cf6f48c12369adf32a2
parent 71c24c8a90a5112bffd558befa0b6514839cc257
parent b16e447f868ddcf0acb1f8af1899471b18729024
author Abhishek Balam <abhishekbalam96@gmail.com> 1602057953 +0530
committer GitHub <noreply@github.com> 1602057953 +0530
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJffXbhCRBK7hj4Ov3rIwAAdHIIAHYWQ1VfToSoz4Qytd3/jBGu
 wkRMuhZ1oafYXmG4CUiWczyZordqXzjcThELT4ljbuKn7riMLFSVdplTh778FSUx
 EZ91VrbC9y+vLMOnWk2+9nie4WWrfQGN4HXSLfXlivil7RODREfzUL9Ds7Hs/2QF
 wbHITct5oE9NB7BzkgtAkkeY6UGtiBFVpTFEd0AG803zhPr8iAlgYq4w7Dt2YB7D
 yNlU/BP2QbYuDQTZCZao7Di5NClnZ5zPLqnyntgOvkedqEXtNHSY8W96Q2LMInkr
 363ahWbhq4WCkDVf+FYvzJN87NVM2wkZcWTeJJtdz3ot3+bkITKejhWgoY02F+E=
 =UZFv
 -----END PGP SIGNATURE-----
 

Merge branch 'develop' into pricing_rule_on_condition