Merge remote-tracking branch 'server/master' with strategy "ours", eliminating bdfb763037270e509cb13ba75ebe3b6d5c1b76ca;

Browse Source

Commit bdfb763037 is now on branch ORC-icons, and I have major concerns
with its implementation.

...

This commit is contained in:

Axel Uhl committed 2015-06-19 01:30:03 +02:00

2 parents a6e0abdc9f e0e08a23ab

commit f20f915f8c

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