Merge branch 'development' into UpdateMethod

# Conflicts:
#	automated install/basic-install.sh
This commit is contained in:
Promofaux 2016-08-30 19:32:40 +01:00
commit 01a9534729
3 changed files with 21 additions and 10 deletions

View file

@ -1,4 +1,7 @@
<html>
<head>
<script>window.close();</script>
</head>
<body>
</body>
</html>
</html>