Skip to content
Commit 7107f213 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'legacy-0.6' 

# Conflicts:
#   pom.xml
#   src/main/java/es/redmic/db/administrative/model/Activity.java
parents 2dd96106 3f0f6c88
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment