diff options
author | Adrien Thebo <git@somethingsinistral.net> | 2013-04-08 10:04:43 -0700 |
---|---|---|
committer | Adrien Thebo <git@somethingsinistral.net> | 2013-04-08 10:04:43 -0700 |
commit | af7bed2bc82be0123e2aefe5d569661718e0d6f4 (patch) | |
tree | dde7c30f17fa9935f74179d3d0b41cd560ab4555 /.gitignore | |
parent | 755d3d2de505d098faa323fa751497d7f4a3dad1 (diff) | |
parent | 6647d1c69d1feb20d0d51a9cbd8734259bac4ef3 (diff) |
Merge branch '2.x-backport_gemfile' into 2.x
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -2,3 +2,6 @@ pkg/ .DS_Store metadata.json coverage/ +Gemfile.lock +.bundle/ +vendor/bundle/ |