歯医者さんから開放されたので 
c39ad4ab2 (upstream/master) Bump capistrano from 3.11.2 to 3.12.1 (#13264)
0b33d2b0f Bump webmock from 3.8.0 to 3.8.3 (#13265)
e2b816b4d Bump sidekiq-scheduler from 3.0.0 to 3.0.1 (#13233)
1780f0094 Bump simple_form from 5.0.1 to 5.0.2 (#13231)
897ff630e Bump json-ld from 3.1.0 to 3.1.1 (#13230)
e65996f92 Bump redis from 2.8.0 to 3.0.2 (#13102)
ce228a440 Bump mkdirp from 0.5.1 to 1.0.3 (#12979)
6c1e452d2 Bump sass from 1.25.0 to 1.26.3 (#13263)
44cdc330a Bump react-test-renderer from 16.12.0 to 16.13.0 (#13260)
83f193361 Bump react-dom from 16.12.0 to 16.13.0 (#13181)
a4387acea Bump babel-jest from 24.9.0 to 25.1.0 (#12973)
6dfc161ad Bump react-immutable-proptypes from 2.1.0 to 2.2.0 (#13259)
dependabotさん大活躍!
$ git merge --no-edit master
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Auto-merging Gemfile
Automatic merge failed; fix conflicts and then commit the result.
しゅまんかった