# fix js combine
Merge branch '1.4' of https://github.com/aploss/zo2 into 1.4