Merge branch 'P5-server' into school-server
Conflicts:
branding.spec
images/boot.jpg
images/boot.png
images/logo.png
notes/release-notes.all.html.in
Showing
19.5 KB
This diff is collapsed.
Click to expand it.
2.49 KB
File moved
2.52 KB
3.97 KB
File moved
43 Bytes
File moved
images/boot.jpg
deleted
100644 → 0
60.3 KB
images/product-logo.png
0 → 100644
14.3 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/makelink.js
0 → 100644
slideshow/Server_01.png
0 → 100644
219 KB
slideshow/Server_02.png
0 → 100644
179 KB
slideshow/Server_03.png
0 → 100644
152 KB
slideshow/Server_04.png
0 → 100644
137 KB
slideshow/Server_05.png
0 → 100644
161 KB