contents_controller
Email
Synchronise changes
sYNCHRONIZE
Merge branch 'master' of ssh://git@github.com/trickyil2000/SingelPD.git

Conflicts:
	controllers/emails_controller.php
	models/email_send.php
	views/smarty/templates/contents/contact.tpl
Merge branch 'master' of ssh://git@github.com/trickyil2000/SingelPD.git