Skip to content
Snippets Groups Projects
Commit b08dbf1e authored by Andrej Zabka's avatar Andrej Zabka
Browse files

Merge branch 'develop' into security

# Conflicts:
#	core/src/test/java/cz/muni/pa165/CoreIT.java
#	visualization/src/test/java/cz/muni/pa165/rest/VisualizationIT.java
parents 93975660 69f9d5cb
No related branches found
No related tags found
Loading
Pipeline #
Showing
with 432 additions and 365 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