Marius Burkard
2016-06-14 1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c
refs
author Marius Burkard <m.burkard@pixcept.de>
Tuesday, June 14, 2016 04:18 -0400
committer Marius Burkard <m.burkard@pixcept.de>
Tuesday, June 14, 2016 04:18 -0400
commit1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c
tree 61ac7bcc848f4f42b750de98d67a9e10c2d6819b tree | zip | gz
parent da8c5263302809434d43c9f385f8bac57b49d851 view | diff
701f4d81bf0e2ec0e25b8b6adb03345636e9f450 view | diff
Merge branch 'florian030/ispconfig3-master' into stable-3.1
27 files modified
57 ■■■■ changed files
interface/web/mail/xmpp_domain_edit.php 2 ●●● diff | view | raw | blame | history
interface/web/sites/database_quota_stats.php 3 ●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 4 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ar_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/bg_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/br_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ca_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/cz_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/en_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/es_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fi_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fr_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hr_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hu_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/id_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/it_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ja_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/nl_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pl_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pt_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ro_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ru_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/se_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/sk_usersettings.lng 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/tr_usersettings.lng 2 ●●● diff | view | raw | blame | history