Merge branch 'master' into carousel

2016-11-30 14:34:34 -08:00
parent dd08e2bae9 56ce4d8ee3
commit 53d3f8b134
16 changed files with 374 additions and 647 deletions
@@ -24,6 +24,6 @@
 				<a href="https://github.com/kubernetes/kubernetes" class="button">Contribute to the K8s codebase</a>
 			</div>
 		</div>
-		<div id="miceType" class="center">&copy; {{ 'now' | date: "%Y" }} Kubernetes</div>
+		<div id="miceType" class="center">&copy; {{ 'now' | date: "%Y" }} The Kubernetes Authors | Distributed under <a href="https://github.com/kubernetes/kubernetes.github.io/blob/master/LICENSE" class="light-text">CC BY 4.0</a></div>
 	</main>
 </footer>