| commit | c35df5ce8069d1189199a02acb14bc1ddf46e9c6 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@erpnext.com> | Tue Sep 08 15:54:17 2015 +0530 |
| committer | Anand Doshi <anand@erpnext.com> | Tue Sep 08 15:54:17 2015 +0530 |
| tree | cec8fcecf89a25558117d56dc3b23bb67b764f91 | |
| parent | 43888546f657bcf5ac489b932ec92d05e812689f [diff] | |
| parent | 2c2868db118e71aa781425df0938731c6effddd0 [diff] |
Merge branch 'rmehta-stock-settings' into develop Conflicts: erpnext/patches.txt