project: fix upstream merge (#1247)

Browse Source

project: fix upstream merge

Co-authored-by: TheStonedTurtle <mgoodwin559@gmail.com>
Co-authored-by: null <ikada@protonmail.ch>
Co-authored-by: Tomas Slusny <slusnucky@gmail.com>
Co-authored-by: Adam <Adam@sigterm.info>
Co-authored-by: Daniel Bolink <dabolink@uvic.ca>

...

This commit is contained in:

Owain van Brakel

2019-08-03 13:35:10 +02:00

committed by GitHub

parent 2358f76b5b 990dcca9aa

commit 445b1fb2a5

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

Diff Content Not Available