Merge remote-tracking branch 'upstream/master' into typo

Browse Source

Conflicts:
	templates/backOffice/default/I18n/fr_FR.php

...

This commit is contained in:

Boyquotes

2014-03-25 11:27:29 +01:00

parent 2cd39279a8 1b27d6c22a

commit 45cfe83037

9 changed files with 1046 additions and 974 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

1895

templates/backOffice/default/I18n/en_US.php

File diff suppressed because it is too large Load Diff