Resolve conflicts (merge master)

Browse Source

...

This commit is contained in:

Samuel Shifterovich

2018-12-15 17:41:51 +01:00

parent f66ad97134 bd78b52703

commit 8b301230de

14 changed files with 1311 additions and 1434 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

_includes/index.html

+1263 -1378

File diff suppressed because it is too large Load Diff