Skip to content
Snippets Groups Projects
Commit 356a85e1 authored by Karina Cadette's avatar Karina Cadette
Browse files

Merge remote-tracking branch 'origin/master' into kcadette-master-merge

# Conflicts:
#	NOTICE
parents a332720e 506cda77
No related branches found
No related tags found
2 merge requests!346Merge branch 'aws-integration' into 'master',!305update pom
Showing
with 463 additions and 205 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment