Merge branch 'develop' into 'patch-2'
authorkaniini <nenolod@gmail.com>
Thu, 16 Aug 2018 15:23:04 +0000 (15:23 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 16 Aug 2018 15:23:04 +0000 (15:23 +0000)
commitf2fa09c50fde8db4e619872ef6121e90a69324a6
tree4d34037c5fc6d1a3c05a0b061f5279caef1bd671
parent718882b326f00c8315bca5acc439b92aa37bf021
parent5fbb14f5ecbbd9feeed2a303c2619fbbba07d70e
Merge branch 'develop' into 'patch-2'

# Conflicts:
#   mix.exs
mix.exs