Merge branch 'hotfix/removing_secrets'
Merge branch 'release/1.2'
gemfile.lock
heroku push
heroku
heroku
heroku
heroku
Merge branch 'master' into develop