diff options
author | Jonas Smedegaard <dr@jones.dk> | 2017-04-18 21:24:54 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2017-04-18 21:24:54 +0200 |
commit | b8b0dbc7cd0f6e77df9f4f5caf25439790e24507 (patch) | |
tree | 5c638b11dc030ebff4c423eba2f19cc6d484a811 /Makefile | |
parent | cfc8a209942966c44f36fb6218b95922ba3c2311 (diff) | |
parent | 7eb99fe346c4b2474467d918953326bd81b0462c (diff) | |
parent | b7ae373ec3c81232dfb23cf7e4417a7718af2833 (diff) |
Fake-merge branches 'master-da' and 'plaintitle' into plaintitle-da