diff options
author | Max Kellermann <max@musicpd.org> | 2020-09-30 11:48:05 +0200 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2020-09-30 11:48:05 +0200 |
commit | 362f391b7656bc2b539e30b5097023e4fe88947c (patch) | |
tree | eda7ee0f75a8635a210a672b55aa51ca3efd5f7c | |
parent | dd639e18b899a20ec4dbe1fabd14de2ce32348b2 (diff) | |
parent | c883f178b8d57f9acd5208247c6521683346aca3 (diff) | |
parent | 980e32f69cf97952f38cf295d3d0f063e3486fd9 (diff) |
Merge remote-tracking branches 'neheb/defa', 'neheb/auto' and 'neheb/clocale' into master