Merge branch 'master' into edge

2013-02-17 00:27:18 +05:30 · 2013-02-17 00:27:18 +05:30 · 696d6ea073
commit 696d6ea073
parent a0e2f51c2f 19df1882fa
1 changed files with 2 additions and 0 deletions
--- a/startup/init.py
+++ b/startup/init.py
@ -19,6 +19,8 @@
 # default settings that can be made for a profile.
 from __future__ import unicode_literals

+import webnotes
+
 lang_names = {
 	"हिंदी": "hi",
 	"english": "en",