Anand Doshi 24f2445065 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions ... Conflicts: webnotes/__init__.py webnotes/core/doctype/docfield/docfield.txt webnotes/core/page/data_import_tool/data_import_tool.js webnotes/defaults.py webnotes/install_lib/install.py webnotes/model/bean.py webnotes/model/code.py webnotes/sessions.py webnotes/tests/test_nested_set.py webnotes/widgets/page.py		2013-12-26 19:12:35 +05:30
..
conf.py	install, web serving, session booting	2013-12-12 19:11:07 +05:30
Framework.sql	Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions	2013-12-26 19:12:35 +05:30
GeoIP.dat	moved files inside webnotes	2013-12-11 10:54:35 +05:30
languages.txt	Install fixes, started to rewrite translate.py webnotes/wnframework#351	2013-12-17 17:03:45 +05:30