Merge branch '2.5.x' into cc-5709-airtime-analyzer

Browse source

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

...

This commit is contained in:

Albert Santoni 2014-07-15 16:41:29 -04:00

parent e84f765696 3b6b0f8b69

commit 1aa99e2896

12 changed files with 13 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo

View file

Binary file not shown.