ISPConfig3 devel
parent: e37c42 | patch | commitdiff
Till Brehm
2016-07-06 993d8282e531d37e868f01c16add9363d92a0bb5
refs
author Till Brehm <tbrehm@ispconfig.org>
Wednesday, July 6, 2016 10:29 -0400
committer Till Brehm <tbrehm@ispconfig.org>
Wednesday, July 6, 2016 10:29 -0400
commit993d8282e531d37e868f01c16add9363d92a0bb5
tree 70c614ecaff6fa0c02cdfef3a3c06325e49169e6 tree | zip | gz
parent e37c4206de73fea71f0d6e1fd6b47befa81f580c view | diff
a666126a2f37520c6990a1670baba9ddf070b1a5 view | diff 
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
5 files added
15 files modified
314 ■■■■■ changed files
.gitignore 1 ●●●●● diff | view | raw | blame | history
interface/lib/classes/functions.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_ip_list.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/clients_list.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/resellers_list.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_a_list.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_soa_admin_list.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_soa_edit.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_soa_list.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_user_list.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/cron_list.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/database_admin_list.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/database_list.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_admin_list.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_list.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/assets/fonts/glyphicons-halflings-regular.eot diff | view | raw | blame | history
interface/web/themes/default/assets/fonts/glyphicons-halflings-regular.svg 229 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/assets/fonts/glyphicons-halflings-regular.ttf diff | view | raw | blame | history
interface/web/themes/default/assets/fonts/glyphicons-halflings-regular.woff diff | view | raw | blame | history
interface/web/themes/default/assets/javascripts/ispconfig.js 2 ●●●●● diff | view | raw | blame | history