tree d2790ceb87526e0ff81f3d8cf2bf2e9ca68ee47b
parent 3da50f09609d12385134663db77cfc237cabc2a4
parent f146e8b7f52a3e46e335c0fefd92c347717b370b
author Bárbara Perretti <bags_per@hotmail.com> 1381946958 -0300
committer Bárbara Perretti <bags_per@hotmail.com> 1381946958 -0300

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