Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2

9 years ago · 6344e12d8f
parent 9808c57ca7 9f71c99ecf
commit 6344e12d8f
1 changed files with 2 additions and 0 deletions
--- a/.mailmap
+++ b/.mailmap
@ -15,3 +15,5 @@
 # See the following pages for more information:
 # https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html
 # http://stacktoheap.com/blog/2013/01/06/using-mailmap-to-fix-authors-list-in-git/
+Erika Savell <esa46@uclive.ac.nz>
+Connor Taylor-Brown <cbt24@cs17086jp.canterbury.ac.nz> <cbt24@uclive.canterbury.ac.nz> <