ISPConfig3 devel
parent: d30f2c | patch | commitdiff
Marius Burkard
2016-05-03 03d03093c9ca77befa029931e089f8abac96d3bb
refs
author Marius Burkard <m.burkard@pixcept.de>
Tuesday, May 3, 2016 08:39 -0400
committer Marius Burkard <m.burkard@pixcept.de>
Tuesday, May 3, 2016 08:39 -0400
commit03d03093c9ca77befa029931e089f8abac96d3bb
tree bff20a9b62642cc5da218fa8a409edfd9cedbc0b tree | zip | gz
parent d30f2c69b1fbfcb9bebe17996d11dc4863afd8bc view | diff
08f1113d0404a21c06eff9f5ff560a5dd722187c view | diff 
Merge branch 'master' into 'stable-3.1'

Master



See merge request !333
26 files modified
30 ■■■■■ changed files
interface/web/dashboard/dashlets/templates/modules.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/ar_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/bg_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/br_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/ca_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/cz_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/de_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/el_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/en_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/fi_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/fr_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/hr_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/hu_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/id_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/it_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/ja_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/nl_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/pl_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/pt_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/ro_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/ru_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/se_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/sk_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/tr_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_alias.tform.php 2 ●●●●● diff | view | raw | blame | history