Merge branch 'master' into gh-pages

This commit is contained in:
Oleh Zasadnyy 2014-08-18 13:15:03 +03:00
commit ce9fc173fd

View file

@ -109,6 +109,7 @@ Going to use template? Go on! The only thing we ask - let us know at [*lviv@gdg.
* [GDG DevFest Omsk 2014](http://gdg-devfest-omsk.org/)
* [GDG Bangalore Site](http://gdgbangalore.github.io/)
* [2014 南阳 GDG Devfest 大会](http://devfest.gdgny.org)
* [DevFest Nordeste 2014](http://devfestnordeste.github.io/devfest-2014/)
### Contributors
* Design and markup: [Oleh Zasadnyy](https://github.com/ozasadnyy)