src/backend/combined/config.php · 32438bde7a73ca6f5094b684fde244cc65b40692 · Björn Fischer / z-push

Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into... · aa801676

Sebastian Kummer authored Jan 25, 2016

Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into bugfix/ZP-810-Missing-config-BackendCombined

Conflicts:
	src/backend/combined/config.php

aa801676

config.php 4.62 KB

Replace config.php