summaryrefslogtreecommitdiff
path: root/ics-openvpn-stripped/main/openvpn/.mailmap
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-08-02 10:52:28 +0200
committerParménides GV <parmegv@sdf.org>2014-08-02 10:52:28 +0200
commit4aedacdf92ab2fc08a1e39618761bc1eb96427d6 (patch)
treef000311e97598ab3fc42e2bea23e6cb342ad166c /ics-openvpn-stripped/main/openvpn/.mailmap
parentb28eeb08e8ec3baafdd9388cc5b70c6c84db9cf1 (diff)
parent0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 (diff)
Merge branch 'bug/There-are-two-different-notifications-#5794' into develop
Diffstat (limited to 'ics-openvpn-stripped/main/openvpn/.mailmap')
-rw-r--r--ics-openvpn-stripped/main/openvpn/.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/ics-openvpn-stripped/main/openvpn/.mailmap b/ics-openvpn-stripped/main/openvpn/.mailmap
new file mode 100644
index 00000000..91ff5537
--- /dev/null
+++ b/ics-openvpn-stripped/main/openvpn/.mailmap
@@ -0,0 +1 @@
+James Yonan <james@openvpn.net> james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>