Skip to content
Snippets Groups Projects
Commit 17ebc553 authored by Douglas Hall's avatar Douglas Hall
Browse files

Merge pull request #23 from Harvard-University-iCommons/develop 

Merging develop to master for v1.2.0 (Fixed import conflict)
parents 8563a86f 6f60e451
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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