Skip to content
Snippets Groups Projects
Commit a9133823 authored by Carlos Galindo's avatar Carlos Galindo
Browse files

Merge branch 'carlos' into develop 

# Conflicts:
#	sdg-core/src/main/java/es/upv/mist/slicing/nodes/VariableAction.java
parents b2b2401a 0a230da4
No related branches found
No related tags found
1 merge request!60Introduction of polymorphic nodes in object trees
Pipeline #112 passed
Stage: test