Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/controllers/ScheduleController.php install_minimal/airtime-install install_minimal/include/AirtimeInstall.php install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py python_apps/pypo/pypofetch.py python_apps/pypo/pypopush.py |
||
---|---|---|
.. | ||
airtime-import | ||
airtime-check-system | ||
airtime-check-system.php | ||
airtime-log | ||
airtime-log.php | ||
airtime-update-db-settings | ||
airtime-update-db-settings.py | ||
airtime-user | ||
airtime-user.php | ||
phone_home_stat | ||
phone_home_stat.php | ||
rivendell-converter.sh | ||
serbianLatinToCyrillicConverter.py |