summaryrefslogtreecommitdiff
path: root/plugins/additional_message_headers
diff options
context:
space:
mode:
authorCyrill von Wattenwyl <cvw@adfinis.com>2014-09-02 11:21:25 +0200
committerCyrill von Wattenwyl <cvw@adfinis.com>2014-09-02 11:21:25 +0200
commit141d615f394853ceafe13ba79ac3043ed06e6013 (patch)
tree2e84ea758248c3c29061b82440eb75b8703eb12b /plugins/additional_message_headers
parent11a40dd1fef6c5b78b054617caba4325f95ee386 (diff)
Fixed merge conflicts
Diffstat (limited to 'plugins/additional_message_headers')
0 files changed, 0 insertions, 0 deletions