Merge remote branch 'inger/office-server' into P5
Conflicts:
branding.spec
Showing
19.5 KB
59 Bytes
2.49 KB
2.52 KB
3.97 KB
3.97 KB
5.68 KB
File moved
43 Bytes
File moved
2.4 KB
indexhtml/img/bg.png
deleted
100644 → 0
175 Bytes
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
xfce-settings/xinitrc.in
0 → 100644