summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-12-27 09:57:40 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-12-27 09:57:40 +0100
commitd8c2d0051afa93001973da117d38c8a72dbd11e2 (patch)
tree8976d9025348730cdf19b385e080fe40e03f8985
parent6fe60569f5720f07e41d4794b40509699dfc620c (diff)
parent7e66ea89e677e9182676f756b940a90377b9b228 (diff)
downloadnextcloud-server-d8c2d0051afa93001973da117d38c8a72dbd11e2.tar.gz
nextcloud-server-d8c2d0051afa93001973da117d38c8a72dbd11e2.zip
Merge pull request #21368 from owncloud/xenopathic-mailmap
Update mailmap for myself
-rw-r--r--.mailmap3
-rw-r--r--.mention-bot4
2 files changed, 6 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index ec69fc5318e..7d6e6c7ee5d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -305,7 +305,8 @@ Robin Appelman <icewind@owncloud.com> Robin <robin@Amaya.(none)>
Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail.com>
Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail>
Robin Appelman <icewind@owncloud.com> Robin Appelman <robin@icewind.nl>
-Robin McCorkell <rmccorkell@karoshi.org.uk> Robin McCorkell <rmccorkell@owncloud.com>
+Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@karoshi.org.uk>
+Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@owncloud.com>
Rodrigo Hjort <rodrigo.hjort@gmail.com>
Roeland Jago Douma <rullzer@owncloud.com> Roeland Jago Douma <roeland@famdouma.nl>
rok <brejktru@gmail.com>
diff --git a/.mention-bot b/.mention-bot
index 449cf7d1c68..c805917bee0 100644
--- a/.mention-bot
+++ b/.mention-bot
@@ -5,6 +5,10 @@
{
"name": "DeepDiver1975",
"files": ["apps/dav/**"]
+ },
+ {
+ "name": "Xenopathic",
+ "files": ["apps/files_external/**"]
}
],
"userBlacklist": ["owncloud-bot", "scrutinizer-auto-fixer"]