summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2015-01-22 16:15:47 +0100
committerJonas Smedegaard <dr@jones.dk>2015-01-22 16:15:47 +0100
commit611edbf0fd0a15c83b29b21748f2d884abe89efa (patch)
tree65889dc6bef5eeaa42064863dd9d5a162ef66ef1
parent9931aff15bbcff33f1673be6df2b6b90b365178c (diff)
parent7d34028b5eed40b316ee237572b529b6d93d94ee (diff)
parentd67784de063e575b1e2b24d3788ff64dfe99a709 (diff)
parente97919eb9d8d3c1f6258752f19979bf284bac608 (diff)
Merge branches 'bars', 'h5bp' and 'langsbottom' into plaintitleplaintitle