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
..
templates	Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n	2013-10-16 15:09:18 -03:00
__init__.py	[website] [minor] moving to framework	2013-09-10 13:46:28 +05:30
utils.py	[fix] [minor] [website]	2013-09-17 13:46:50 +05:30