Merge remote-tracking branch 'upstream/pull/4054'

diff --git a/.gitignore b/.gitignore
index 75e9eb59e73fe2fb5dfe474e590dfed8fd748c67..e5866532e5299d4815f527ae4bd2dc74c196680a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *~
 .DS_Store
+.bundle/config
 .idea
 .ruby-gemset
 .ruby-version