Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589

Browse Source

# Conflicts:
#	resources/locales/messages.de.xlf
#	resources/locales/messages.en.xlf
#	resources/locales/messages.fr.xlf
#	resources/locales/messages.nl.xlf
#	resources/locales/validators.de.xlf
#	resources/locales/validators.en.xlf
#	resources/locales/validators.fr.xlf
#	resources/locales/validators.nl.xlf

...

This commit is contained in:

Mike Ng

2018-01-09 09:50:27 +04:00

parent 1aa919cc08 655352e199

commit 2c75dc654f

78 changed files with 4604 additions and 2183 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

900

resources/locales/messages.en.xlf

File diff suppressed because it is too large Load Diff