Leopoldthecoder 3243b8fc98 Merge branch 'dev' into 1.2-merge1 ... # Conflicts: # package.json # src/utils/popup/index.js # yarn.lock		2017-02-09 17:33:42 +08:00
..
build-all.js	fix : this didn't run on windows	2016-11-30 18:32:11 +08:00
build-entry.js	optimize build.entry.js	2017-01-13 16:13:50 +08:00
build-locale.js	Locale: add umd build, close #2604 (#2658)	2017-02-07 14:13:29 +08:00
gen-cssfile.js	feat: auto generator cssfile (#368)	2016-10-13 12:05:43 +08:00
i18n.js	Merge i18n to master (#972)	2016-11-10 21:46:55 +08:00
iconInit.js	Refactor build scripts, fix #148	2016-09-27 11:15:55 +08:00
new-lang.js	Merge i18n to master (#972)	2016-11-10 21:46:55 +08:00
new.js	Clean packages (#2345)	2017-01-23 14:06:01 +08:00
version.js	Changelog: update for 1.1.5	2017-01-17 11:47:35 +08:00