tree e0f6dea7a7ceb7a4f5c9d2ef69082430e6ca7932
parent 5c44219084e825feea72c60a83bc6889e3cf1bc9
author Florian Zschocke <florian.zschocke@cycos.com> 1403489539 +0200
committer Florian Zschocke <florian.zschocke@devolo.de> 1477645345 +0200

Add merge type setting to repository page.

The merge type is a per repository setting. Add it to the edit page.