Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
authorlambda <pleromagit@rogerbraun.net>
Sun, 17 Feb 2019 17:39:45 +0000 (17:39 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sun, 17 Feb 2019 17:39:45 +0000 (17:39 +0000)
commita2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782
tree6020b41080baf529496a5faf36e1523279a76511
parent25ab90edeaae53b6ce084d1ba9a02df5505b5041
parent79e503b3f5ea87c53d4c616ca9ddfa049877705c
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'

# Conflicts:
#   mix.exs
mix.exs