include/class.dynamic_forms.php · 5989cb6dd0f07c39007e3629b7368768f2676e69 · docker / osticket

"handler/manage_device_key.go" did not exist on "9426482289d89037e7fd9a98aecab0a17d564a75"

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