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

Browse source

Conflicts:
	CREDITS

...

This commit is contained in:

Albert Santoni 2015-01-22 11:29:38 -05:00

parent a40067ca55 6492128ce9

commit 230cdcccb4

46 changed files with 690 additions and 512 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.