FreeNAS/freenas 62a7556 — gui/api resources.py, gui/freeadmin/static/lib/js freeadmin.js
Merge remote-tracking branch 'origin/master' into FIX-24402
| Delta | File | |
|---|---|---|
| +48 | -0 | src/middlewared/middlewared/plugins/vm.py |
| +23 | -0 | gui/templates/vm/vncweb.html |
| +21 | -0 | gui/vm/admin.py |
| +11 | -0 | gui/vm/views.py |
| +8 | -1 | gui/vm/forms.py |
| +5 | -1 | gui/api/resources.py |
| +2 | -1 | gui/vm/urls.py |
| +3 | -0 | gui/freeadmin/static/lib/js/freeadmin.js |
| +121 | -3 | 8 files |
