Saif Ur Rehman 1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt		2019-02-01 19:17:04 +05:00
..
doctype	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12	2019-02-01 19:17:04 +05:00
page	[fix] Links now redirect to erpnext.com	2019-01-25 12:56:27 +05:30
setup_wizard	Merge branch 'master' into develop	2019-01-31 13:34: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	chore: Add error logging for failed get_exchange_rate call	2019-01-24 16:28:53 +05:30