Marius Cramer
2014-07-01 47568c8833fcc26d53c32cb1369847c6dd40c384
refs
author Marius Cramer <m.cramer@pixcept.de>
Tuesday, July 1, 2014 12:37 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Tuesday, July 1, 2014 12:37 -0400
commit47568c8833fcc26d53c32cb1369847c6dd40c384
tree cde0e4ec315f455ad3204e6d4ad2c70e09772357 tree | zip | gz
parent c67eea43798034415e7bcdbb49f90e8d6e3a141d view | diff
877874b0caa0efdb98780f0fd54eeebe6838028d view | diff
Merge branch 'master' into 'master'

Master
5 files modified
365 ■■■■ changed files
interface/web/admin/lib/lang/fr_server_config.lng 281 ●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_dkim.lng 12 ●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_wizard.lng 29 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/fr_mail_domain.lng 17 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fr_resync.lng 26 ●●●● diff | view | raw | blame | history