Conflicts: .zfproject.xml application/configs/airtime-conf.php build/build.properties public/css/styles.css |
||
---|---|---|
.. | ||
sql | ||
build.properties | ||
database.conf | ||
runtime-conf.xml | ||
schema.xml | ||
update_db_info.py |
Conflicts: .zfproject.xml application/configs/airtime-conf.php build/build.properties public/css/styles.css |
||
---|---|---|
.. | ||
sql | ||
build.properties | ||
database.conf | ||
runtime-conf.xml | ||
schema.xml | ||
update_db_info.py |