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

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

Conflicts: branding.spec components/browser-qt/design/design.ini.in
parents cab8e858 9dba8abd
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