Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
authorlambda <lain@soykaf.club>
Mon, 8 Apr 2019 09:18:01 +0000 (09:18 +0000)
committerlambda <lain@soykaf.club>
Mon, 8 Apr 2019 09:18:01 +0000 (09:18 +0000)
commitb4da2bc1d009ecca0d7821abe3577d1a920c41c0
treec75ce1ec6e70724c29efe540a2439de635abc160
parentcfa6e7289f5cfdb1fce17eb89bc0513ff624480d
parentb177e1e7f330ff1531be190949db7f75e378a449
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'

# Conflicts:
#   config/config.exs
#   docs/config.md
config/config.exs
docs/config.md