Merge branch 'develop' of https://github.com/xpressengine/xe-core (1.8.14)

Conflicts:
	classes/context/Context.class.php
	modules/point/tpl/config.html
This commit is contained in:
Kijin Sung 2015-12-02 14:38:23 +09:00
commit a22e69b7ec
59 changed files with 249 additions and 36 deletions

View file

@ -993,7 +993,7 @@ class moduleController extends module
}
}
$oDB->commit;
$oDB->commit();
return new Object();
}