Skip to content
Snippets Groups Projects
Commit d217468f authored by Jarek Polok's avatar Jarek Polok :speech_balloon:
Browse files

Merge branch 'master' into 'service_migration' 

# Conflicts:
#   VERSION
#   rpm/aims2.spec
parents 66aeba24 6219c856
No related branches found
No related tags found
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