Marius Burkard
2015-12-23 69fe1ea229e5d2c3a6ecc3fc3c5438790bfc8b05
refs
author Marius Burkard <m.burkard@pixcept.de>
Wednesday, December 23, 2015 12:27 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Wednesday, December 23, 2015 12:27 -0500
commit69fe1ea229e5d2c3a6ecc3fc3c5438790bfc8b05
tree 2d7cddf48068fadf0b210e9af973fe8b0c5ca5c0 tree | zip | gz
parent 6a00b4e599f724cbc9a12927c8a0446ef5621028 view | diff
c067e5e1bf8d2d9947df4c23dbac235ad2f63c87 view | diff
Merge branch 'jnorell/ispconfig3-master'
6 files modified
99 ■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 3 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 2 ●●● diff | view | raw | blame | history
interface/lib/plugins/vm_openvz_plugin.inc.php 4 ●●●● diff | view | raw | blame | history
interface/web/vm/openvz_template_edit.php 2 ●●● diff | view | raw | blame | history
interface/web/vm/templates/openvz.conf.tpl 84 ●●●● diff | view | raw | blame | history
remoting_client/examples/openvz_template_add.php 4 ●●●● diff | view | raw | blame | history