Skip to content

Add What is the Internet video for CSP#9232

Merged
sfilman merged 2 commits into
stagingfrom
internet-video
Jun 29, 2016
Merged

Add What is the Internet video for CSP#9232
sfilman merged 2 commits into
stagingfrom
internet-video

Conversation

@sfilman

@sfilman sfilman commented Jun 29, 2016

Copy link
Copy Markdown
Contributor

No description provided.

@sfilman

sfilman commented Jun 29, 2016

Copy link
Copy Markdown
Contributor Author

@Bjvanminnen sanity check plz :)

csp_concept_cybercrime AuYNXgO_f3Y http://videos.code.org/2015/csp/concept_cybercrime.mp4
csp_concept_encryption ZghMPWGXexs http://videos.code.org/2015/csp/concept_encryption.mp4
csp_concept_http_html kBXQZMmiA4s http://videos.code.org/2015/csp/concept_http_html.mp4
csp_concept_what_is_internet Dxcc6ycZ73M https://videos.code.org/2015/csp/what_is_the_internet.mp4

@Bjvanminnen Bjvanminnen Jun 29, 2016

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.

all of our other videos use http instead of https here. not sure it matters, but also not sure it doesnt

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.

actually, as i expand the diff i see we already have a mix and this is prob fine

@Bjvanminnen

Copy link
Copy Markdown
Contributor

lgtm

@sfilman sfilman merged commit 8c3823f into staging Jun 29, 2016
@sfilman sfilman deleted the internet-video branch June 29, 2016 17:27
@jeremydstone jeremydstone restored the internet-video branch June 29, 2016 19:45
@jeremydstone

Copy link
Copy Markdown

Reverted because the video addition caused all video thumbnails to shift by one

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants