Merge branch 'master' into docker

This commit is contained in:
dosse91 2017-11-07 06:41:39 +01:00
commit ca7b638e73

View file

@ -1,6 +1,6 @@
<?php <?php
$db_type="postgresql"; //Type of db: "mysql", "sqlite" or "postgresql" $db_type="mysql"; //Type of db: "mysql", "sqlite" or "postgresql"
// Sqlite3 settings // Sqlite3 settings
$Sqlite_db_file = "../telemetry.sql"; $Sqlite_db_file = "../telemetry.sql";