Fixed conflict after merge with master

This commit is contained in:
Enrico Turri 2018-07-27 12:15:35 +02:00
commit 590773d77b
18 changed files with 4553 additions and 2760 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff