Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sintonia/python_apps/media-monitor
History
Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
 		2012-02-14 14:47:07 -05:00
..
airtimefilemonitor Merge branch '2.0.x' into devel 2012-02-14 14:47:07 -05:00
install Merge branch '2.0.x' into devel 2012-02-14 14:47:07 -05:00
MediaMonitor.py
…
airtime-media-monitor
…
airtime-media-monitor-init-d
…
logging.cfg
…
media-monitor.cfg
…
monit-airtime-media-monitor.cfg
…