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

Browse source

Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php

...

This commit is contained in:

drigato 2014-08-28 11:59:41 -04:00

parent e5a74e7285 716cc5a754

commit 9fe0830dfd

93 changed files with 36793 additions and 2254 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/fr_FR/LC_MESSAGES/airtime.mo

View file

Binary file not shown.

563

airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po

View file

File diff suppressed because it is too large Load diff