Merge remote-tracking branch 'origin/Beta' into Beta

Browse Source

# Conflicts:
#	locale/en/LC_MESSAGES/strings.po
#	locale/es/LC_MESSAGES/strings.po
#	locale/ro/LC_MESSAGES/strings.po
#	locale_template/strings.pot

...

This commit is contained in:

Marius

2019-09-14 02:15:15 +03:00

parent e82bc22caf 6ec3ea6baf

commit 38646d3273

6 changed files with 9223 additions and 9476 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

2862

locale/es/LC_MESSAGES/strings.po

File diff suppressed because it is too large Load Diff