Merge branch 'master' into develop

This commit is contained in:
Nabin Hait 2017-03-02 18:03:33 +05:30
commit f9139dee31

View file

@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template
__version__ = '7.2.25'
__version__ = '7.2.26'
__title__ = "Frappe Framework"
local = Local()