Commit 5340a063 authored by bmanager bmanager's avatar bmanager bmanager

Merge branch 'master' into '1.3-dev'

# Conflicts:
#   Changelog.md
#   specs/argonaut-systemd.spec
parents 64898528 1a205e02
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