Saif Ur Rehman 74a3370095 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/patches.txt # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/sales_order/sales_order.json		2019-01-22 16:20:40 +05:00
..
doctype	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12	2019-01-22 16:20:40 +05:00
page	Docs in website (#10149)	2017-07-28 11:44:08 +05:30
setup_wizard	Merge branch 'staging' into develop	2018-12-13 10:45:32 +05:30
__init__.py	moved modules inside erpnext folder	2013-12-11 10:43:52 +05:30
default_success_action.py	fix: import unicode_literals	2019-01-15 14:47:32 +05:30
install.py	Success Action (#13666)	2018-05-03 19:06:32 +05:30
utils.py	Merge pull request #15966 from codingCoffee/frankfurter	2018-11-12 18:35:36 +05:30