Manish Verma f2981b7ec3 Merge remote-tracking branch 'refs/remotes/origin/release-v1.9.2' ...

# Conflicts:
#	app/Console/Kernel.php
#	app/FaveoStorage/Controllers/SettingsController.php
#	app/Http/Controllers/Admin/helpdesk/TemplateController.php

2017-01-05 19:09:35 +05:30

..

helpdesk

Merge remote-tracking branch 'refs/remotes/origin/release-v1.9.2'

2017-01-05 19:09:35 +05:30

MailFetch.php

Apply fixes from StyleCI

2016-12-13 13:14:54 +00:00