Merge lp:~willcooke/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu into lp:ubiquity-slideshow-ubuntu

Proposed by Will Cooke on 2017-09-15
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2017-09-20
Approved revision: 794
Merged at revision: 796
Proposed branch: lp:~willcooke/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 28 lines (+1/-1)
1 file modified
slideshows/ubuntu/slides/music.html (+1/-1)
To merge this branch: bzr merge lp:~willcooke/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2017-09-15 Approve on 2017-09-20
Iain Lane 2017-09-15 Pending
Review via email: mp+330823@code.launchpad.net

Description of the Change

* Add new screenshots for 17.10
* Replaced music.jpg with music.png and updated HTML
* Added source for welcome.png

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

Do we have a new mascott too? :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'images-source/ubuntu/welcome-17.10.xcf'
2Binary files images-source/ubuntu/welcome-17.10.xcf 1970-01-01 00:00:00 +0000 and images-source/ubuntu/welcome-17.10.xcf 2017-09-15 10:23:31 +0000 differ
3=== modified file 'slideshows/ubuntu/slides/music.html'
4--- slideshows/ubuntu/slides/music.html 2015-04-01 00:01:34 +0000
5+++ slideshows/ubuntu/slides/music.html 2017-09-15 10:23:31 +0000
6@@ -18,4 +18,4 @@
7 </div>
8 </div>
9
10-<img class="screenshot" src="screenshots/music.jpg"/>
11+<img class="screenshot" src="screenshots/music.png"/>
12
13=== modified file 'slideshows/ubuntu/slides/screenshots/browse.png'
14Binary files slideshows/ubuntu/slides/screenshots/browse.png 2016-03-22 19:44:10 +0000 and slideshows/ubuntu/slides/screenshots/browse.png 2017-09-15 10:23:31 +0000 differ
15=== modified file 'slideshows/ubuntu/slides/screenshots/customize.png'
16Binary files slideshows/ubuntu/slides/screenshots/customize.png 2016-10-11 17:02:27 +0000 and slideshows/ubuntu/slides/screenshots/customize.png 2017-09-15 10:23:31 +0000 differ
17=== modified file 'slideshows/ubuntu/slides/screenshots/gs.png'
18Binary files slideshows/ubuntu/slides/screenshots/gs.png 2016-03-23 10:40:23 +0000 and slideshows/ubuntu/slides/screenshots/gs.png 2017-09-15 10:23:31 +0000 differ
19=== removed file 'slideshows/ubuntu/slides/screenshots/music.jpg'
20Binary files slideshows/ubuntu/slides/screenshots/music.jpg 2016-03-22 18:49:10 +0000 and slideshows/ubuntu/slides/screenshots/music.jpg 1970-01-01 00:00:00 +0000 differ
21=== added file 'slideshows/ubuntu/slides/screenshots/music.png'
22Binary files slideshows/ubuntu/slides/screenshots/music.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/screenshots/music.png 2017-09-15 10:23:31 +0000 differ
23=== modified file 'slideshows/ubuntu/slides/screenshots/office.png'
24Binary files slideshows/ubuntu/slides/screenshots/office.png 2016-03-22 19:44:10 +0000 and slideshows/ubuntu/slides/screenshots/office.png 2017-09-15 10:23:31 +0000 differ
25=== modified file 'slideshows/ubuntu/slides/screenshots/photos.png'
26Binary files slideshows/ubuntu/slides/screenshots/photos.png 2016-03-22 19:44:10 +0000 and slideshows/ubuntu/slides/screenshots/photos.png 2017-09-15 10:23:31 +0000 differ
27=== modified file 'slideshows/ubuntu/slides/screenshots/welcome.png'
28Binary files slideshows/ubuntu/slides/screenshots/welcome.png 2017-03-15 17:56:26 +0000 and slideshows/ubuntu/slides/screenshots/welcome.png 2017-09-15 10:23:31 +0000 differ

Subscribers

People subscribed via source and target branches