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

This commit is contained in:
Erika Savell
2017-03-29 23:07:57 +13:00
+1 -1
View File
@@ -16,4 +16,4 @@
# https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html # 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/ # http://stacktoheap.com/blog/2013/01/06/using-mailmap-to-fix-authors-list-in-git/
Erika Savell <[email protected]> Erika Savell <[email protected]>
Connor Taylor-Brown <[email protected]> <[email protected]> < Connor Taylor-Brown <[email protected]> <[email protected]>