Merge remote-tracking branch 'upstream/master' into patch-orangeforum

2018-02-05 02:48:30 -05:00 · 2018-02-05 02:48:30 -05:00 · 35cbbad23a
parent aa223cf46c 09eb1ae0e1
commit 35cbbad23a
1 changed files with 0 additions and 2 deletions
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -37,8 +37,6 @@ Commits | Author
     4 | Alexandr Emelin <frvzmb@gmail.com>
     4 | AndrewCz <smacz42@users.noreply.github.com>
     4 | Chris McCormick <chris@mccormick.cx>
-     4 | Colin Pokowitz <colin@cpdev.me>
-     4 | Colin Pokowitz <colinpokowitz03@gmail.com>
     4 | Cory Gibbons <hello@corygibbons.com>
     4 | D <DL88250@gmail.com>
     4 | Dominik Pfaffenbauer <dominik@lineofcode.at>