Merge branch 'develop' into 'feat/floki-fast-html-2'
authorlain <lain@soykaf.club>
Sun, 9 Aug 2020 10:53:58 +0000 (10:53 +0000)
committerlain <lain@soykaf.club>
Sun, 9 Aug 2020 10:53:58 +0000 (10:53 +0000)
commitd0fc48ea67d90bf01bd546088b114362592d5eb0
treec4c56684cbe680fc0c024e028618dc291520bd74
parentcb376c4c4ca6491f2b58a9a916986998312640f5
parentad29a4f2cf4496aaa9463e11d94b35364e9cddae
Merge branch 'develop' into 'feat/floki-fast-html-2'

# Conflicts:
#   config/config.exs
config/config.exs