Skip to content

Conversation

ozasadnyy
Copy link
Member

@ozasadnyy ozasadnyy merged commit 65f321a into master Aug 28, 2016
nisrulz added a commit to gdgnewdelhi/hoverboard that referenced this pull request Sep 29, 2016
# By Oleh Zasadnyy (4) and others
# Via GitHub
* 'master' of github.com:gdg-x/hoverboard:
  Update README.md
  v1.0.3 (gdg-x#139)
  Update README.md
  Adding DevFest Mezam 2016 to list. (gdg-x#130)
  Fix header-content reads title & videoId from hoverboard.config.json (gdg-x#132)
  v.1.0.2 (gdg-x#118)

Conflicts:
	data/en/resources.json
	data/speakers.json
	data/uk/resources.json
	images/backgrounds/home.png
	src/elements/footer-block.html
	src/elements/header-content.html
nisrulz added a commit to gdgnewdelhi/hoverboard that referenced this pull request Sep 29, 2016
* master:
  Update README.md
  v1.0.3 (gdg-x#139)
  Update README.md
  Adding DevFest Mezam 2016 to list. (gdg-x#130)
  Fix header-content reads title & videoId from hoverboard.config.json (gdg-x#132)
  v.1.0.2 (gdg-x#118)
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.

2 participants