Merge branch 'development' into wildcardblacklisting

2017-01-09 14:53:01 +01:00
parent 2b778695b1 642a73508d
commit 2935275227
8 changed files with 353 additions and 216 deletions
@@ -24,7 +24,8 @@ if [[ ! $EUID -eq 0 ]];then
 fi

 webpageFunc() {
-  /opt/pihole/webpage.sh "$@"
+  source /opt/pihole/webpage.sh
+  main "$@"
  exit 0
 }