Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge theirs master #629

Merged
merged 7 commits into from
May 29, 2018
Merged

Merge theirs master #629

merged 7 commits into from
May 29, 2018

Conversation

kuceb
Copy link
Contributor

@kuceb kuceb commented May 29, 2018

No description provided.

jennifer-shehane and others added 7 commits May 26, 2018 17:26
* support video tag, add videos

* add mp4 script, add mp4s, mocha->jest

* remove extra deps, delete original gif

* use yall.min

* fix typo 'eable' -> 'enable'

* chore(deps): update sinon-chai to 3.1.0 🌟 (#611)

* Append config title to page title or subtitle - replace cypress.io w/ cypress (#615)

- Convention states we reference ‘cypress.io’ as ‘cypress’ when
participant is already aware of cypress context
- Add Cypress to title for help with bookmarks, etc.
- close #610

* chore(deps): update sinon to 5.0.10 🌟 (#614)

* fix gulpfile

* add 3 new blogs from issue-28 (#617)

* bump hexo

* Add new blog, screencasts, and talks

* bump package.lock

* add img for new blogs

add imgs for three new blogs

* add new blogs 

add three new blogs to examples/media

* add img for blog

img for vue.js hackernews clone blog

* add new blog

add e-2-e testing vue.js hackernews clone blog

* add img to blogs

* add blogs

reached out to Committed for author credit, received.

* fix loading of yalljs:
* fix videos on some browsers

* add gif2mp4 script, fix snippet-creator, delete useless file

* rename log util
@brian-mann brian-mann merged commit 33ea727 into develop May 29, 2018
@jennifer-shehane jennifer-shehane deleted the merge-theirs-master branch September 18, 2018 10:49
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