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

Browse source

Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml

...

This commit is contained in:

drigato 2014-10-08 11:46:08 -04:00

parent 0ccc7e7dc9 5cc93eac3c

commit c4692cc0d7

33 changed files with 1807 additions and 1149 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.