Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content

Browse Source

...

This commit is contained in:

Michael Vogel

2016-02-17 12:18:46 +01:00

parent 8af8567567 fb28713ca3

commit c770b00d6d

67 changed files with 4438 additions and 22303 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

6800

view/ru/messages.po

File diff suppressed because it is too large Load Diff

637

view/ru/strings.php

File diff suppressed because it is too large Load Diff