ISPConfig3 devel
parent: 988687 | patch | commitdiff
Till Brehm
2014-05-09 6a001aa768d5a7b9a9a5a638be84cee16df6afe0
refs
author Till Brehm <tbrehm@ispconfig.org>
Friday, May 9, 2014 09:23 -0400
committer Till Brehm <tbrehm@ispconfig.org>
Friday, May 9, 2014 09:23 -0400
commit6a001aa768d5a7b9a9a5a638be84cee16df6afe0
tree 479202ca09692038139a1aeba3c980c69b2baf88 tree | zip | gz
parent 98868735b2b72285b5521f8c08ccb174d0cb70be view | diff
ac3c7b1e66e09ed4cb4f357ae4041613f9a222b3 view | diff 
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
9 files modified
1 files added
528 ■■■■■ changed files
install/lib/installer_base.lib.php 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/ispconfig_request.inc.php 263 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_password.inc.php 10 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_system_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/directive_snippets_edit.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/index.php 16 ●●●●● diff | view | raw | blame | history
interface/web/js/scrigo.js.php 101 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main.tpl.htm 3 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 4 ●●●●● diff | view | raw | blame | history
server/plugins-available/shelluser_jailkit_plugin.inc.php 125 ●●●●● diff | view | raw | blame | history