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

# Conflicts:

#	resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
This commit is contained in:
Manish Verma
2016-11-06 21:52:57 +05:30
7 changed files with 35 additions and 24 deletions

View File

@@ -671,7 +671,9 @@ if ($thread->title != "") {
<td>{!! $ticket_form_data->content !!}</td>
</tr>
@endforeach
</tbody></table>
</tbody>
</table>
@endif
@endif