Commit b5cb2111 authored by Rajko Albrecht's avatar Rajko Albrecht
Browse files

Merge branch 'develop' of into develop

* 'develop' of
  package naming

# Conflicts:
#	dupstep/ui/open_backup.ui
parents 7a98545c 68dce207
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