| commit | 28dd8d7efdb6c66bddb18d1f6f48ddf2b5249d28 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Wed Nov 27 19:27:44 2019 +0100 |
| committer | omar <omarcornut@gmail.com> | Wed Nov 27 19:27:44 2019 +0100 |
| tree | 21a9dcc14b74ec4f8fdd1385a4a55fc96921f0bb | |
| parent | 4dff49b2f1408e48418f4a67461036f4900a3eca [diff] |
Docking: Fixed various conflicts not properly resolved on 813e0c1 New git client confusion.