Merge branch 'master' into develop

This commit is contained in:
Rushabh Mehta 2017-05-19 19:41:03 +05:30
commit 0d8b0b5c4d
2 changed files with 4 additions and 4 deletions

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__ = '8.0.50'
__version__ = '8.0.51'
__title__ = "Frappe Framework"
local = Local()

View file

@ -121,9 +121,9 @@ function pack(output_path, inputs, minify) {
function babelify(content, path, minify) {
let presets = ['es2015', 'es2016'];
if(minify) {
presets.push('babili'); // new babel minifier
}
// if(minify) {
// presets.push('babili'); // new babel minifier
// }
try {
return babel.transform(content, {
presets: presets,