Merge branch '2.5.x' into saas

Browse source

Conflicts:
	airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po

...

This commit is contained in:

Albert Santoni 2015-02-18 16:03:14 -05:00

parent 717d322dc8 68cd5b027a

commit 3c064b13a9

11 changed files with 10 additions and 9771 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/ja_JP/LC_MESSAGES/airtime.mo

View file

Binary file not shown.

4884

airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po

View file

File diff suppressed because it is too large Load diff