Skip to content
Commit 1dd39879 authored by Michal Batko's avatar Michal Batko
Browse files

Merge origin/master into devel 

Conflicts:
	messif/algorithms/impl/LocatorStorageAlgorithm.java
	messif/algorithms/impl/MultiQueryWrapperAlgorithm.java
	messif/buckets/storage/impl/DiskStorage.java
	messif/objects/text/TextConversion.java
	messif/utility/Convert.java
parents 8ae9dd7b 7e429164
Expand all 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