Florian Schaal
2014-03-11 b769cc8edfc8503055f3b3b5b86b7076e939ad4e
refs
author Florian Schaal <florian@schaal-24.de>
Tuesday, March 11, 2014 15:01 -0400
committer Florian Schaal <florian@schaal-24.de>
Tuesday, March 11, 2014 15:01 -0400
commitb769cc8edfc8503055f3b3b5b86b7076e939ad4e
tree 790bb13d196345eb1efa64078448b73e87352f9d tree | zip | gz
parent 6ff8d7bcb40c074e6b1b12c33d9478cdad0c6bd0 view | diff
11ca0c5316e1c84ace4eb8e40c8d2868f508f13a view | diff
Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
6 files modified
23 ■■■■■ changed files
install/dist/lib/opensuse.lib.php 4 ●●● diff | view | raw | blame | history
install/lib/install.lib.php 1 ●●●● diff | view | raw | blame | history
install/tpl/apache_ispconfig.conf.master 6 ●●●● diff | view | raw | blame | history
server/conf/apache_ispconfig.conf.master 6 ●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 4 ●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/500-backup.inc.php 2 ●●● diff | view | raw | blame | history