Commit da5a411b authored by Sergey V Turchin's avatar Sergey V Turchin

Merge remote-tracking branch 'boyarsh/centaurus' into kdesktop

Conflicts: branding.spec
parents 6954ff84 811cb56b
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