0a45de7fba
Conflicts: .gitignore airtime_mvc/application/configs/airtime-conf.php airtime_mvc/application/configs/classmap-airtime-conf.php airtime_mvc/application/models/RabbitMq.php airtime_mvc/application/models/Schedule.php airtime_mvc/application/models/StoredFile.php airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php airtime_mvc/application/models/airtime/map/CcShowTableMap.php airtime_mvc/application/models/airtime/om/BaseCcShow.php airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php airtime_mvc/application/modules/rest/Bootstrap.php airtime_mvc/application/modules/rest/controllers/MediaController.php airtime_mvc/build/sql/schema.sql airtime_mvc/public/index.php
15 lines
181 B
Plaintext
15 lines
181 B
Plaintext
.*
|
|
*.pyc
|
|
vendor/*
|
|
composer.phar
|
|
composer.lock
|
|
*~$
|
|
*log.*
|
|
**/airtime_analyzer.egg-info/*
|
|
**/build/*
|
|
**/dist/*
|
|
*~
|
|
/airtime_mvc/tests/test_results.xml
|
|
/tests/results.html
|
|
/tests/*.jar
|