seitime-frappe/webnotes/core
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
..
doctype Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
page Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:35 +05:30
report Translations redesigned webnotes/wnframework#351 2013-12-19 18:27:00 +05:30
.no_timestamps moved files inside webnotes 2013-12-11 10:54:35 +05:30
__init__.py moved files inside webnotes 2013-12-11 10:54:35 +05:30
notifications.py notifications via hooks webnotes/wnframework#351 2013-12-13 15:34:12 +05:30
README.md moved files inside webnotes 2013-12-11 10:54:35 +05:30

Core module contains the models required for the basic functioning of wnframework including DocType, Profile (user), Role and others.