ISPConfig3 devel
parent: 9b3069 | patch | commitdiff
Marius Cramer
2014-04-28 5f6dd42906472fbded5f9fd122379f15ad3307c0
refs
author Marius Cramer <m.cramer@pixcept.de>
Monday, April 28, 2014 04:45 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Monday, April 28, 2014 04:45 -0400
commit5f6dd42906472fbded5f9fd122379f15ad3307c0
tree 5ea0487716be33494cbbef96ed3927c3e7df0582 tree | zip | gz
parent 9b3069a1eacd3cbda0bfe565925e80f667f6c96d view | diff
0ccfef02aa3dad9970ba405a75cc565c903e3026 view | diff 
Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	interface/lib/config.inc.php
	interface/web/themes/blue/ispconfig_version
2 files added
9 files modified
703 ■■■■■ changed files
install/lib/update.lib.php 11 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0003.sql 1 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0050.sql 17 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0068.sql 2 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0071.sql 3 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0074.sql 250 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0075.sql 80 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 329 ●●●●● diff | view | raw | blame | history
interface/web/client/client_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/templates/dashboard.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/themes/blue/ispconfig_version 2 ●●●●● diff | view | raw | blame | history