Marius Cramer
2014-08-18 a9e6315be66a5cf3a743a1e1a7c8da4eb980e97c
refs
author Marius Cramer <m.cramer@pixcept.de>
Monday, August 18, 2014 12:35 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Monday, August 18, 2014 12:35 -0400
commita9e6315be66a5cf3a743a1e1a7c8da4eb980e97c
tree df334cfd0997a238a1f0b5b1fd525ae9d5be0ced tree | zip | gz
parent fef8248f430365a100bd585196ef7cdc04e5c131 view | diff
c9fa7a415dde4c95141336bc0deccfa5ff560196 view | diff
Merge branch 'master' into 'master'

Master

See merge request !120
1 files modified
69 ■■■■ changed files
server/plugins-available/mail_plugin_dkim.inc.php 69 ●●●● diff | view | raw | blame | history