Skip to content
GitLab
Commit b2a8f366 authored by Steve Weber's avatar Steve Weber 💠
Browse files

Merge branch 'master' into 'patch-3' 

# Conflicts:
#   CONTRIBUTING.md
parents 880389a6 841f4e98
Hide whitespace changes
Inline Side-by-side
CONTRIBUTING.md
View file @ b2a8f366
Steve Weber - s8weber@uwaterloo.ca
James McCarthy - jmccarth@uwaterloo.ca
Mirko - mvucicev@uwaterloo.ca
\ No newline at end of file
Mirko - mvucicev@uwaterloo.ca
yahoo
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment