An error occurred while fetching folder content.
Merge branch 'master' of github.com:truenas/webui into NAS-116162
Evgeny Stepanovych authored
 Conflicts:
	src/app/pages/vm/devices/device-edit/device-edit.component.ts
cc0a754f
Name Last commit Last update