Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2

Browse source

Signed-off-by: Roland Häder <roland@mxchange.org>

...

This commit is contained in:

Roland Häder 2017-06-13 23:26:06 +02:00

parent e9c9c47a84 de5a0dadb0

commit 4e49939421

No known key found for this signature in database

GPG key ID: B72F8185C6C7BD78

165 changed files with 63565 additions and 40577 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

8943

view/lang/en-us/messages.po Normal file

View file

File diff suppressed because it is too large Load diff

2062

view/lang/en-us/strings.php Normal file

View file

File diff suppressed because it is too large Load diff