merge !40
authorDan Allen <dan@opendevise.com>
Thu, 15 Mar 2018 22:43:35 +0000 (22:43 +0000)
committerDan Allen <dan@opendevise.com>
Thu, 15 Mar 2018 22:43:35 +0000 (22:43 +0000)
commit3a3f027cad40df563d1897daf4aee763613a4f7c
treed3243a8f5ed569b5ac0d2f86be479afab7645749
parent1d8a04125743e45c8396cd6ba277a8eb9344e4a0
parent2a1564589b053f255853b53c1c1ffb915e3d3c37
merge !40

Enable Kotlin and Scala language support in highlight.js config