Marius Burkard
2016-02-04 eca13b968042fe7c21a5a01daaf1e1dffd3a83c6
refs
author Marius Burkard <m.burkard@pixcept.de>
Thursday, February 4, 2016 12:09 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Thursday, February 4, 2016 12:09 -0500
commiteca13b968042fe7c21a5a01daaf1e1dffd3a83c6
tree 56d49107e8d1182ba9b464059c2991e4a687fe48 tree | zip | gz
parent 0c6ca563001ffeaf12081a26f226bf0cab543b65 view | diff
a6e530436a45b2b06e71ad5840b99319c64636fa view | diff
Merge branch 'stable-3.1'
6 files modified
48 ■■■■■ changed files
install/update.php 2 ●●● diff | view | raw | blame | history
interface/web/js/scrigo.js.php 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_user_del.php 2 ●●● diff | view | raw | blame | history
interface/web/themes/default/assets/javascripts/ispconfig.js 31 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/assets/javascripts/ispconfig.min.js 2 ●●● diff | view | raw | blame | history
server/lib/classes/monitor_tools.inc.php 5 ●●●● diff | view | raw | blame | history