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
..
email_lib	Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions	2013-12-26 19:12:35 +05:30
__init__.py	Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions	2013-12-26 19:12:35 +05:30
backups.py	install, web serving, session booting	2013-12-12 19:11:07 +05:30
datautils.py	[copyright] added Contributors	2013-11-20 12:58:35 +05:30
dateutils.py	[fix] [minor] hide fields and report filters fixed	2013-12-04 19:01:37 +05:30
file_lock.py	[minor] fix file lock booboo	2013-12-23 20:01:11 +05:30
file_manager.py	Fixed bugs in default cache clearing, created new Attach field type for attachments and other minor fixes with file uploads	2013-12-24 18:50:39 +05:30
install.py	Added Applications page and fixed issues in translations and hooks	2013-12-23 16:08:25 +05:30
minify.py	[minor] [fix] minify	2013-10-02 16:40:18 +05:30
nestedset.py	[minor] merge conflict fixed	2013-11-21 12:33:52 +05:30
scheduler.py	Merged with develop	2013-12-26 10:36:37 +05:30