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

Browse source

Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po

...

This commit is contained in:

Albert Santoni 2014-06-09 11:36:51 -04:00

parent a12ebf2cb1 345c782eb9

commit 560d1a9b14

8 changed files with 28 additions and 9 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/hu_HU/LC_MESSAGES/airtime.mo

View file

Binary file not shown.