Merge remote-tracking branch 'origin/pr/342'

Browse Source

Conflicts:
	po/pt_BR.po

...

This commit is contained in:

Sébastien Helleu 2015-03-13 20:04:28 +01:00

parent ada9dce5e6 6bd8a5be20

commit ce582201a0

1 changed files with 279 additions and 153 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

432

po/pt_BR.po

File diff suppressed because it is too large Load Diff