Merge remote-tracking branch 'remotes/origin/master' into 1.4.0

Browse source

# Conflicts:
#	shared/i18n/pl_google_translate.translation

...

This commit is contained in:

WolverinDEV 2019-10-19 19:00:14 +02:00

parent 5dfa6bd6d2 2a46f4ae2c

commit 305149f5af

1 changed files with 3317 additions and 3317 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

6634

shared/i18n/pl_google_translate.translation

View file

File diff suppressed because it is too large Load diff