no message
/Applications/XAMPP/xamppfiles/htdocs/product/gembels/protected/config/main.php
Merge branch 'master' of https://github.com/curcuroyong/gembels

Conflicts:
	protected/config/main.php