Merge branch 'development' into UpdateMethod

# Conflicts: # automated install/basic-install.sh
2016-08-30 19:32:40 +01:00
parent d938f73207 921278c5ea
commit 01a9534729
3 changed files with 21 additions and 10 deletions
--- a/advanced/index.html
+++ b/advanced/index.html
@@ -1,4 +1,7 @@
 <html>
+<head>
+<script>window.close();</script>
+</head>
 <body>
 </body>
-</html>
+</html>