Merge branch 'master' into release-1.4

This commit is contained in:
Devin Donnelly
2016-09-08 16:11:25 -07:00
33 changed files with 57 additions and 74 deletions
-2
View File
@@ -18,8 +18,6 @@
<a href="https://calendar.google.com/calendar/embed?src=nt2tcnbtbied3l6gi2h29slvc0%40group.calendar.google.com" class="calendar"><span>Events Calendar</span></a>
</div>
<div>
<span>I wish this page</span>
<input type="text" id="wishField" name="wishField" placeholder="enter your wish">
</div>
</div>
<div id="miceType" class="center">&copy; {{ 'now' | date: "%Y" }} Kubernetes</div>