ISPConfig3 devel
parent: 1fa1bc | patch | commitdiff
Marius Cramer
2015-06-07 fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44
refs
author Marius Cramer <m.cramer@pixcept.de>
Sunday, June 7, 2015 12:16 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Sunday, June 7, 2015 12:16 -0400
commitfc0edb2f00bcdc6baaaa29f9041e82f3003b9b44
tree 2c29ad42d53652c666cf7957fb3ddb86a1031421 tree | zip | gz
parent 1fa1bcead3a1fc02c1ff81732ce0e561df64822b view | diff
a8ac8563fde1c019664512d983a592df49e2908c view | diff 
Merge branch 'master' into 'master'

add mailfilter to resync

See merge request !202
24 files modified
81 ■■■■■ changed files
interface/web/tools/lib/lang/ar_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/bg_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/br_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/cz_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/en_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/es_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fi_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fr_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hr_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hu_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/id_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/it_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ja_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/nl_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pl_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pt_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ro_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ru_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/se_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/sk_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/tr_resync.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/resync.php 35 ●●●●● diff | view | raw | blame | history