# fix mistypo in theme generate
Merge branch '1.4.3' of https://github.com/cleversoft/zo2 into 1.4.3

Conflicts:
	plugins/system/zo2/framework/includes/framework.php