1aa99e2896
Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po |
||
|---|---|---|
| .. | ||
| az/LC_MESSAGES | ||
| cs_CZ/LC_MESSAGES | ||
| de_AT/LC_MESSAGES | ||
| de_DE/LC_MESSAGES | ||
| el_GR/LC_MESSAGES | ||
| en_CA/LC_MESSAGES | ||
| en_GB/LC_MESSAGES | ||
| en_US/LC_MESSAGES | ||
| es_ES/LC_MESSAGES | ||
| fr_FR/LC_MESSAGES | ||
| hr_HR/LC_MESSAGES | ||
| hu_HU/LC_MESSAGES | ||
| hy/LC_MESSAGES | ||
| it_IT/LC_MESSAGES | ||
| ka/LC_MESSAGES | ||
| ko_KR/LC_MESSAGES | ||
| nl_NL/LC_MESSAGES | ||
| pl_PL/LC_MESSAGES | ||
| pt_BR/LC_MESSAGES | ||
| ru_RU/LC_MESSAGES | ||
| sr_RS/LC_MESSAGES | ||
| sr_RS@latin/LC_MESSAGES | ||
| template | ||
| zh_CN/LC_MESSAGES | ||