Conflicts: airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po |
||
---|---|---|
.. | ||
sql | ||
airtime-php.logrotate | ||
airtime.conf | ||
build.properties | ||
runtime-conf.xml | ||
schema.xml |