Fixed conflicts after pulling from master

Browse source

...

This commit is contained in:

Enrico Turri 2019-07-19 15:47:10 +02:00

parent 91d574f8ad

commit 3285bf7945

1 changed files with 25 additions and 25 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files