Merge branch 'master' into customer-login

This commit is contained in:
Anand Doshi
2013-09-04 15:10:17 +05:30
22 changed files with 259 additions and 27 deletions

View File

@@ -3,14 +3,14 @@
import os
import webnotes
import webnotes.webutils
def make():
from startup.webutils import get_home_page
if not webnotes.conn:
webnotes.connect()
home_page = webnotes.webutils.get_home_page()
home_page = get_home_page()
fname = 'js/wn-web.js'
if os.path.basename(os.path.abspath('.'))!='public':