Florian Schaal
2014-11-06 208a069f90fe68ecf2242b8ef177b1a5a0095f00
refs
author Florian Schaal <florian@schaal-24.de>
Thursday, November 6, 2014 04:52 -0500
committer Florian Schaal <florian@schaal-24.de>
Thursday, November 6, 2014 04:52 -0500
commit208a069f90fe68ecf2242b8ef177b1a5a0095f00
tree 98a88fb245a9bf306c6e39138b6c154493a374c0 tree | zip | gz
parent 990ca8a44d72cddc12db503f8e623fb9979e5b45 view | diff
c28bb43232ab64cd17fc359fc482fc274974822f view | diff
Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
9 files modified
50 ■■■■■ changed files
install/install.php 2 ●●● diff | view | raw | blame | history
install/lib/install.lib.php 3 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 8 ●●●● diff | view | raw | blame | history
install/update.php 2 ●●● diff | view | raw | blame | history
interface/lib/classes/db_mysql.inc.php 5 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_actions.inc.php 4 ●●● diff | view | raw | blame | history
server/lib/classes/monitor_tools.inc.php 3 ●●●●● diff | view | raw | blame | history
server/lib/classes/system.inc.php 12 ●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 11 ●●●● diff | view | raw | blame | history