Skip to content

Commit 2bab82b

Browse files
committed
Merge remote-tracking branch 'origin/master' into make-actionview-optional
2 parents 6f03a1f + 6c58809 commit 2bab82b

File tree

2 files changed

+1
-82
lines changed

2 files changed

+1
-82
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@
1313
.rspec_status
1414

1515
.ruby-version
16+
Gemfile.lock

Gemfile.lock

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)