Manish Verma 42292945f6 Merge remote-tracking branch 'refs/remotes/origin/arindam-bug-priority' ...

# Conflicts:

#	resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php

2016-11-06 21:52:57 +05:30

..

default1

Merge remote-tracking branch 'refs/remotes/origin/arindam-bug-priority'

2016-11-06 21:52:57 +05:30