Problems in Theodul controls plugin due to wrong resolves of merge conflicts

Steps to reproduce

Steps to reproduce:
1. Qualities selector not available
2. Logo too large (if different logo was configured)

Activity

Show:
Greg Logan
October 20, 2015, 10:04 PM

Merged PR 667 () as d4d8047.

Fixed and reviewed
Your pinned fields
Click on the next to a field label to start pinning.

Assignee

Rüdiger Rolf

Reporter

Rüdiger Rolf

Severity

Incorrectly Functioning With Workaround