Bárbara Perretti
4b41e5f7f7
Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n
Conflicts:
accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
public/js/complete_setup.js
selling/doctype/opportunity/opportunity.js
selling/doctype/quotation/quotation.js
2013-10-16 15:09:18 -03:00
..
2013-02-25 18:17:51 +05:30
2013-09-30 18:11:48 -03:00
2013-09-27 16:33:22 +05:30
2013-02-25 18:17:51 +05:30