Merge branch 'master' into develop

gdg-x · Aug 22, 2014 · e9ee50a · e9ee50a
2 parents 84c47e3 + 86d3257
commit e9ee50a
Show file tree

Hide file tree

Showing 73 changed files with 1 addition and 1,640 deletions.
diff --git a/_includes/post.html b/_includes/post.html
@@ -13,6 +13,7 @@
                         </div>
                         <div class="share pull-right">
                             <ul class="social-links">
+                            {% assign postUrl = site.url | append:page.url %} 
                                 <li>
                                     <a href="https://plus.google.com/share?url={{ page.url | prepend: site.baseurl | prepend: site.url }}" onclick="window.open('https://plus.google.com/share?url={{ page.url | prepend: site.baseurl | prepend: site.url }}', 'newwindow', 'width=600, height=500'); return false;">
                                         <svg class="icon icon-google-plus" viewBox="0 0 30 32">

diff --git a/_site/LICENSE.txt b/_site/LICENSE.txt
diff --git a/_site/assets/GDG_DevFest_Partnership.pdf b/_site/assets/GDG_DevFest_Partnership.pdf
diff --git a/_site/fonts/desktop.ini b/_site/fonts/desktop.ini
diff --git a/_site/fonts/glyphicons-halflings-regular.eot b/_site/fonts/glyphicons-halflings-regular.eot
diff --git a/_site/fonts/glyphicons-halflings-regular.svg b/_site/fonts/glyphicons-halflings-regular.svg
diff --git a/_site/fonts/glyphicons-halflings-regular.ttf b/_site/fonts/glyphicons-halflings-regular.ttf
diff --git a/_site/fonts/glyphicons-halflings-regular.woff b/_site/fonts/glyphicons-halflings-regular.woff
diff --git a/_site/img/Thumbs.db b/_site/img/Thumbs.db
diff --git a/_site/img/conference.jpg b/_site/img/conference.jpg
diff --git a/_site/img/direction-details.jpg b/_site/img/direction-details.jpg
diff --git a/_site/img/favicons/apple-touch-icon-114x114.png b/_site/img/favicons/apple-touch-icon-114x114.png
diff --git a/_site/img/favicons/apple-touch-icon-120x120.png b/_site/img/favicons/apple-touch-icon-120x120.png
diff --git a/_site/img/favicons/apple-touch-icon-144x144.png b/_site/img/favicons/apple-touch-icon-144x144.png
diff --git a/_site/img/favicons/apple-touch-icon-152x152.png b/_site/img/favicons/apple-touch-icon-152x152.png
diff --git a/_site/img/favicons/apple-touch-icon-57x57.png b/_site/img/favicons/apple-touch-icon-57x57.png
diff --git a/_site/img/favicons/apple-touch-icon-60x60.png b/_site/img/favicons/apple-touch-icon-60x60.png
diff --git a/_site/img/favicons/apple-touch-icon-72x72.png b/_site/img/favicons/apple-touch-icon-72x72.png
diff --git a/_site/img/favicons/apple-touch-icon-76x76.png b/_site/img/favicons/apple-touch-icon-76x76.png
diff --git a/_site/img/favicons/apple-touch-icon-precomposed.png b/_site/img/favicons/apple-touch-icon-precomposed.png
diff --git a/_site/img/favicons/apple-touch-icon.png b/_site/img/favicons/apple-touch-icon.png
diff --git a/_site/img/favicons/browserconfig.xml b/_site/img/favicons/browserconfig.xml
diff --git a/_site/img/favicons/desktop.ini b/_site/img/favicons/desktop.ini
diff --git a/_site/img/favicons/favicon-160x160.png b/_site/img/favicons/favicon-160x160.png
diff --git a/_site/img/favicons/favicon-16x16.png b/_site/img/favicons/favicon-16x16.png
diff --git a/_site/img/favicons/favicon-196x196.png b/_site/img/favicons/favicon-196x196.png
diff --git a/_site/img/favicons/favicon-32x32.png b/_site/img/favicons/favicon-32x32.png
diff --git a/_site/img/favicons/favicon-96x96.png b/_site/img/favicons/favicon-96x96.png
diff --git a/_site/img/favicons/favicon.ico b/_site/img/favicons/favicon.ico
diff --git a/_site/img/favicons/mstile-144x144.png b/_site/img/favicons/mstile-144x144.png
diff --git a/_site/img/favicons/mstile-150x150.png b/_site/img/favicons/mstile-150x150.png
diff --git a/_site/img/favicons/mstile-310x150.png b/_site/img/favicons/mstile-310x150.png
diff --git a/_site/img/favicons/mstile-310x310.png b/_site/img/favicons/mstile-310x310.png
diff --git a/_site/img/favicons/mstile-70x70.png b/_site/img/favicons/mstile-70x70.png
diff --git a/_site/img/hackathon.jpg b/_site/img/hackathon.jpg
diff --git a/_site/img/hero.jpg b/_site/img/hero.jpg
diff --git a/_site/img/partners/Thumbs.db b/_site/img/partners/Thumbs.db
diff --git a/_site/img/partners/gdg-lviv.svg b/_site/img/partners/gdg-lviv.svg
diff --git a/_site/img/partners/gdg-x.svg b/_site/img/partners/gdg-x.svg