]> jfr.im git - irc/freenode/web-7.0.git/commit
Merge branch 'master' into page-placeholders 29/head
authorJohn Dallahan <redacted>
Wed, 24 Feb 2016 16:50:28 +0000 (18:50 +0200)
committerJohn Dallahan <redacted>
Wed, 24 Feb 2016 16:50:28 +0000 (18:50 +0200)
commitffa9f1bca5ad6ac7fb643a1a2406e643834e1c4e
treee86f0b87af4f812a9f17bce8d95e385484775d88
parentfba24f681711796fc6c054532c0e55f6d7eb80c9
parent1eb11308e64551e273cdbd90c0b1762c3bc92331
Merge branch 'master' into page-placeholders