Merge branch 'release/1.1.0' into develop
This commit is contained in:
commit
3f9aa24936
1
.gitignore
vendored
1
.gitignore
vendored
@ -30,7 +30,6 @@ Icon
|
|||||||
*.sassc
|
*.sassc
|
||||||
.sass-cache
|
.sass-cache
|
||||||
capybara-*.html
|
capybara-*.html
|
||||||
.rspec
|
|
||||||
.rvmrc
|
.rvmrc
|
||||||
/.bundle
|
/.bundle
|
||||||
/vendor/bundle
|
/vendor/bundle
|
||||||
|
@ -74,7 +74,7 @@ GEM
|
|||||||
rest-client
|
rest-client
|
||||||
simplecov (>= 0.7)
|
simplecov (>= 0.7)
|
||||||
thor
|
thor
|
||||||
crack (0.4.0)
|
crack (0.4.1)
|
||||||
safe_yaml (~> 0.9.0)
|
safe_yaml (~> 0.9.0)
|
||||||
database_cleaner (1.0.1)
|
database_cleaner (1.0.1)
|
||||||
debug_inspector (0.0.2)
|
debug_inspector (0.0.2)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user