Merge branch 'develop'

Author: nabinhait

frappe/__init__.py

@@ -13,7 +13,7 @@
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template
 
-__version__ = '8.0.17'
+__version__ = '8.0.18'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/desk/doctype/note/note.json

@@ -260,7 +260,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 17:02:57.067556", 
+ "modified": "2017-02-17 17:02:57.095556", 
  "modified_by": "Administrator", 
  "module": "Desk", 
  "name": "Note",