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

Merge remote-tracking branch 'origin/master' into dev 

# Conflicts:
#	NOTICE
#	provider/notification-azure/pom.xml
#	provider/notification-gcp/pom.xml
parents b77f4e57 187cc82c
No related branches found
No related tags found
2 merge requests!239spring-webmvc upgrade,!206Update pom version
Hide whitespace changes
Inline Side-by-side
Showing
with 429 additions and 667 deletions
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