ISPConfig3 devel
parent: 8a77a7 | patch | commitdiff
Marius Cramer
2015-08-23 eb1177f61b0299bb011ffc1180e0d3c7fc1e87fc
refs
author Marius Cramer <m.cramer@pixcept.de>
Sunday, August 23, 2015 09:48 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Sunday, August 23, 2015 09:48 -0400
commiteb1177f61b0299bb011ffc1180e0d3c7fc1e87fc
tree eacbb8f3577a88e7cfc9ebd199c3a65e181ca835 tree | zip | gz
parent 8a77a74e1a7a31196541691fce711bdcebaa1d2e view | diff
2df8c0b83de9efd560e109aae65fe18182f8dc3d view | diff 
Merge branch 'master' into 'master'

Master

See merge request !221
32 files modified
110 ■■■■■ changed files
interface/lib/classes/functions.inc.php 3 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_base.inc.php 9 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_database.inc.php 3 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_dns.inc.php 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_ip_map.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ar_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/bg_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/br_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/cz_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fi_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fr_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hr_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hu_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/id_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ja_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/nl_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pl_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pt_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ro_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ru_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/se_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/sk_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/tr_server_ip_map.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/module.conf.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/server_ip_map_edit.php 11 ●●●●● diff | view | raw | blame | history
server/lib/classes/functions.inc.php 3 ●●●●● diff | view | raw | blame | history
server/plugins-available/mysql_clientdb_plugin.inc.php 3 ●●●●● diff | view | raw | blame | history