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

Merge branch 'devel' of ssh://git-server/messif into devel 

Conflicts:
	messif/buckets/index/LocalAbstractObjectOrder.java
	messif/objects/MetaObject.java
	messif/utility/CoreApplication.java
parents d1987fd5 50cd526b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment