| commit | 8a0dcf1f36e202d4a53dcfa6effb0450ebbcd79d | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@erpnext.com> | Wed Apr 24 11:40:28 2013 +0530 |
| committer | Anand Doshi <anand@erpnext.com> | Wed Apr 24 11:40:28 2013 +0530 |
| tree | 5aab30adcee895711102b270db732a8451a51d62 | |
| parent | 9b826a7cb23c9be2c63d266461ecd6ebcdb5440b [diff] | |
| parent | c54bbc039fbc61831cc5610bb9fced90d03e607c [diff] |
Merge branch 'master' of github.com:webnotes/erpnext into webshop Conflicts: patches/patch_list.py