Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/models/Preference.php install_minimal/include/airtime-db-install.php install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py |
||
---|---|---|
.. | ||
application | ||
build | ||
library | ||
public | ||
tests |