Commit 5c461aef authored by Tatyana's avatar Tatyana 👽

Merge branch 'master' into 'feature/file-preparer'

# Conflicts:
#   src/main/java/application/controller/FxAdminController.java
#   src/main/java/application/util/FileSearcher.java
parents 53bd0c30 51990097
Markdown is supported
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