]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' into release v0.6.0
authorDan Brown <redacted>
Wed, 16 Dec 2015 17:29:34 +0000 (17:29 +0000)
committerDan Brown <redacted>
Wed, 16 Dec 2015 17:29:34 +0000 (17:29 +0000)
commita91d42634d3a8eeb804c1818c10fbdce8b0beec7
treef1b94f7601dc476e9de3d1ff88738b00663273f3
parentf517ef361696ed467c77609d10d1dae3be5d4cbd
parent98d9d8d71b202bea92b12215953606c4fa68e10d
Merge branch 'master' into release