summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-04-18 21:31:20 +0200
committerJonas Smedegaard <dr@jones.dk>2017-04-18 21:31:20 +0200
commit13012d44a3df7e88f216ef018a36dd55b954d9e4 (patch)
treeda18ebd7105607fae4ce655b3fd8255aa7dc0c19
parentb8b0dbc7cd0f6e77df9f4f5caf25439790e24507 (diff)
parent1de0bbdfe8c79a12a5cc7ac5e1ee88543799d3ed (diff)
parente2f4e305e3f009ecb49b5c87a49c86978f3bdc27 (diff)
Merge branches 'master-da' and 'plaintitle' into plaintitle-da