Merge branch 'master' into gnome-desktop
Conflicts:
branding.spec
indexhtml/index-en.html.in
indexhtml/index-ru.html.in
indexhtml/index-uk.html.in
indexhtml/index.css.in
Showing
19.5 KB
This diff is collapsed.
Click to expand it.
59 Bytes
File moved
43 Bytes
File moved
images/product-logo.png
0 → 100644
1.59 KB
2.4 KB
indexhtml/img/bg.png
deleted
100644 → 0
175 Bytes
notes/index-en.html.in
0 → 100644
notes/index-ru.html.in
0 → 100644
notes/index-uk.html.in
0 → 100644