Merge remote-tracking branch 'origin/develop' into install_config
authorPhilipp Holzer <admin@philipp.info>
Sat, 21 Apr 2018 12:23:49 +0000 (14:23 +0200)
committerPhilipp Holzer <admin@philipp.info>
Sat, 21 Apr 2018 12:23:49 +0000 (14:23 +0200)
commit334d3921549a538130220f8b627f39f3e0877e26
tree633cb6375a72dfcc0cc6efa400059ce9aead3465
parent346697d771e2656b4bcd12a5e84045710e9b2b55
parentebe203336fa87376bc0339f89be4ab6d52c6fa04
Merge remote-tracking branch 'origin/develop' into install_config
config/htconfig.php
include/dba.php
index.php
src/Core/Console/NewPassword.php