mirror of https://github.com/coddrago/Heroku
Merge remote-tracking branch 'origin/v1.6.9' into v1.6.9
# Conflicts: # hikka/modules/heroku_info.pypull/77/head
commit
90d7b62380
# Conflicts: # hikka/modules/heroku_info.pypull/77/head