Skip to content

fix: update CDN Desktop app#1407

Merged
Toinane merged 21 commits into
electron:masterfrom
moringaman:cdn-desktop-updates
Jul 4, 2020
Merged

fix: update CDN Desktop app#1407
Toinane merged 21 commits into
electron:masterfrom
moringaman:cdn-desktop-updates

Conversation

@moringaman

Copy link
Copy Markdown
Contributor

No description provided.

@vhashimotoo vhashimotoo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@moringaman Please resolve merge conflicts.

@Toinane Toinane changed the title Just changed my website url feat: add CDN Desktop app Jul 3, 2020
@Toinane

Toinane commented Jul 3, 2020

Copy link
Copy Markdown
Member

hey @moringaman can you fix merge conflict and use prettier format for the yaml file?
It also seem your website is a little broken like you can see on my screenshot:
Capture d’écran 2020-07-03 à 16 42 10

Can you fix all of this? Thank you!

@Toinane Toinane changed the title feat: add CDN Desktop app fix: update CDN Desktop app Jul 3, 2020
@moringaman

Copy link
Copy Markdown
Contributor Author

Hi, All requested changes have been made. thanks

@Toinane Toinane merged commit 077abf2 into electron:master Jul 4, 2020
@Toinane

Toinane commented Jul 4, 2020

Copy link
Copy Markdown
Member

Hey @moringaman thank you for your update! Its all good for us 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants