summaryrefslogtreecommitdiff
path: root/page.tmpl
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2013-10-12 14:47:31 +0200
committerJonas Smedegaard <dr@jones.dk>2013-10-12 14:47:31 +0200
commitf823e522455c9187c079d4b53368b191ad9c54a5 (patch)
tree6c860effc772d7ad01a90f5e6b8696e1620d2cf4 /page.tmpl
parentbbcbfc73b93614ea620b552a545fd889e6d45379 (diff)
parent0e1bb78e6e1d3a6c587673a1d2d07bca2f8e4422 (diff)
parent2b372fd411581c5e143a24674a666bdc68c28860 (diff)
parent7c7037c6eb652bdb6f894e6d996c3ed9bbd7bc13 (diff)
Merge branches 'bars', 'h1title', 'h5bp' and 'langsbottom'