Merge branch 'staging-fixes' into unicode

2019-01-29 11:13:04 +05:30
parent f3c22f342c 596c1b3489
commit e8190473f5
56 changed files with 1306 additions and 196 deletions
--- a/erpnext/www/payment_setup_certification.py
+++ b/erpnext/www/payment_setup_certification.py
@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 import frappe
-import foundation

 no_cache = 1