tree 3576c7c3ac1b42241ccb1740299a9482fbbe0e0b
parent 46e108b34e75237da4315781ed1980a1a3a4fac2
parent 6eb202ef3a57eda9f3b9f81569804d05d155e5e3
author Nabin Hait <nabinhait@gmail.com> 1490688088 +0530
committer Nabin Hait <nabinhait@gmail.com> 1490688088 +0530

Merge branch 'manufacturer_childtable' of https://github.com/dottenbr/erpnext into dottenbr-manufacturer_childtable