fixed conflict while merging develop into v5

2014-12-31 13:24:36 +05:30
parent a4e547d71d b02788b915
commit 54361e8651
43 changed files with 5821 additions and 5738 deletions
--- a/erpnext/setup/page/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.py
@@ -439,4 +439,6 @@ def load_messages(language):
 	send_translations(m)
 	return lang

-
+@frappe.whitelist()
+def load_languages():
+	return sorted(get_lang_dict().keys())