Skip to content
Commit e15af389 authored by Emilio Dolce's avatar Emilio Dolce
Browse files

Merge branch 'Branch_v1.0' of http://gitlab.micegroup.it/mice/voila-runtimes into Branch_v1.0 

# Conflicts:
#	voila-runtime-hibernate-spatial/.classpath
parents 2f0a198d be47bac1
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