Merge remote-tracking branch 'origin/master'

Browse Source

As I managed to redo previous work, but with a better result,
'their' side was completely overwritten by 'our' more recent version.

...

This commit is contained in:

Sebastian Thiel

2016-02-07 10:14:47 +01:00

parent ea56379d85 5dbd93a68c

commit 4e5544b6a3

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