| commit | 611373f37f119908fbb0501a1168a2b5f784b6cd | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@erpnext.com> | Tue Jun 11 12:43:49 2013 +0530 |
| committer | Anand Doshi <anand@erpnext.com> | Tue Jun 11 12:43:49 2013 +0530 |
| tree | 6f0f2c60a7c5e78d4db3ba455d3a9e941faea94e | |
| parent | f16836d75b181552be62601846783528685a2863 [diff] | |
| parent | 49af8754d558c4acf867775391528b96cc75bbad [diff] |
Merge branch 'master' of github.com:webnotes/erpnext into responsive Conflicts: accounts/doctype/purchase_invoice/purchase_invoice.py