Sujit Prasad 226465c496 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	app/Http/Controllers/Agent/kb/PageController.php

2016-06-13 20:46:59 +05:30

..

ArticleController.php

update v 1.0.7.5

2016-06-13 20:41:55 +05:30

CategoryController.php

update v 1.0.7.5

2016-06-13 20:41:55 +05:30

PageController.php

Merge remote-tracking branch 'origin/master'

2016-06-13 20:46:59 +05:30

SettingsController.php

update v 1.0.7.5

2016-06-13 20:41:55 +05:30