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

Browse source

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

...

This commit is contained in:

Naomi 2014-04-23 15:58:39 -04:00

parent f2ce77fecb 578f758274

commit fe20cc7f63

59 changed files with 51180 additions and 50667 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

4678

airtime_mvc/locale/template/airtime.po

View file

File diff suppressed because it is too large Load diff