Till Brehm
2014-06-20 a4165cf33034a5761f333b49a83cf35180e3b5f9
refs
author Till Brehm <tbrehm@ispconfig.org>
Friday, June 20, 2014 12:51 -0400
committer Till Brehm <tbrehm@ispconfig.org>
Friday, June 20, 2014 12:51 -0400
commita4165cf33034a5761f333b49a83cf35180e3b5f9
tree 88c09c596b178081b947bf5083b9a3881cf80eb7 tree | zip | gz
parent d5b5d443196f85cd540bb6af0a4d2350579788ca view | diff
1b8648682c8b403b8947afb8db711734a330b29e view | diff
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
7 files modified
8 ■■■■ changed files
interface/web/js/scrigo.js.php 2 ●●● diff | view | raw | blame | history
interface/web/themes/blue/templates/main.tpl.htm 1 ●●●● diff | view | raw | blame | history
interface/web/themes/default-304/templates/main.tpl.htm 1 ●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main.tpl.htm 1 ●●●● diff | view | raw | blame | history
interface/web/themes/default_64_navimg/templates/main.tpl.htm 1 ●●●● diff | view | raw | blame | history
interface/web/themes/default_combobox/templates/main.tpl.htm 1 ●●●● diff | view | raw | blame | history
interface/web/themes/default_no_navimg/templates/main.tpl.htm 1 ●●●● diff | view | raw | blame | history