Merge branch 'master' into develop

2017-03-29 16:13:14 +03:00
parent 0f4bce1a4f d531d1b339
commit 435d96112e
6 changed files with 36 additions and 42 deletions
@@ -0,0 +1,4 @@
+<link rel="stylesheet" href="/static/css/coffee.css">
+<iframe src="https://host2.kilta.aalto.fi/kahvi/cups" allowfullscreen=true sandbox="allow-scripts allow-pointer-lock allow-same-origin">
+  <p>Your browser does not support iframes.</p>
+</iframe>