include/class.forms.php · 6f88c0da98b93a513db299caac7c955f2cb1c680 · docker / osticket

"setup/cli/git@code.vereign.com:docker/osticket.git" did not exist on "dae2cd608e9a0a52a7ec12d3d535ccb9000d0bcb"

10 years ago

Jared Hancock authored 10 years ago

Conflicts:

	include/i18n/en_US/form.yaml
	include/staff/templates/dynamic-field-config.tmpl.php
	include/staff/ticket-view.inc.php
	include/staff/tickets.inc.php
	scp/js/scp.js

2b422844

History

oops: Bug fixes

Jared Hancock authored 10 years ago

Conflicts:

	include/i18n/en_US/form.yaml
	include/staff/templates/dynamic-field-config.tmpl.php
	include/staff/ticket-view.inc.php
	include/staff/tickets.inc.php
	scp/js/scp.js