diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2015-01-22 18:25:14 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2015-01-22 18:25:14 +0100 |
| commit | 658635ffba844f67e65ddbe6e60bd9830aa8c54b (patch) | |
| tree | 640d9146533e0cd3fb797117064c6d0e801ec9f0 | |
| parent | e8e4e2e9c010d1bfdd2aec595ac2d614cc6d3b9e (diff) | |
| parent | e0011c1880056b4b2a05f8e1e386629bfc699784 (diff) | |
Merge branch 'plaintitle-da' of git://source.jones.dk/ikiwiki/site
Conflicts (manually resolved):
shared
| m--------- | shared | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/shared b/shared -Subproject 8418a770a2be476ecd961d3279d00e151a0a531 +Subproject 0dc5024b0c18e330829e407f0f3a8330eafd6cb |