| commit | 355cbb8f10527032e9c9cedbef5b68f118418d68 | [log] [tgz] |
|---|---|---|
| author | Florian Zschocke <florian.zschocke@cycos.com> | Mon Jun 23 04:12:19 2014 +0200 |
| committer | Florian Zschocke <florian.zschocke@devolo.de> | Fri Oct 28 11:02:25 2016 +0200 |
| tree | e0f6dea7a7ceb7a4f5c9d2ef69082430e6ca7932 | |
| parent | 5c44219084e825feea72c60a83bc6889e3cf1bc9 [diff] |
Add merge type setting to repository page. The merge type is a per repository setting. Add it to the edit page.