Skip to content

Commit 70c8b0d

pboling pboling

committed

🔀 Merge remote-tracking branch 'gl'

# Conflicts: # Gemfile.lock # oauth.gemspec

2 parents 6e0fa91 + 66d2c4b commit 70c8b0dCopy full SHA for 70c8b0d

File tree

1 file changed

+1

-1

lines changed

Gemfile.lock

1 file changed

+1

-1

lines changed

`‎Gemfile.lock‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ GEM`
`190`	`190`	`rdoc (>= 4.0.0)`
`191`	`191`	`reline (>= 0.4.2)`
`192`	`192`	`json (2.14.1)`
`193`		`- kettle-dev (1.1.29)`
	`193`	`+ kettle-dev (1.1.30)`
`194`	`194`	`kettle-soup-cover (1.0.10)`
`195`	`195`	`simplecov (~> 0.22)`
`196`	`196`	`simplecov-cobertura (~> 3.0)`

0 commit comments

Comments

(0)