summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-03 21:03:20 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-03 21:03:20 +0000
commit77c7b5619f3559c12599ac9e3e9fb0af4a49a6b8 (patch)
tree7101760ee5ced01f04573a2184cf2ca67db977c6 /lib/api/files.rb
parentba869ae50d0c43867f7d34a4f7e08520c1e4c7f1 (diff)
parent1ecefd3718f60731da6eb266115dbbb16df948b8 (diff)
downloadgitlab-ce-77c7b5619f3559c12599ac9e3e9fb0af4a49a6b8.tar.gz
Merge branch 'update-spring' into 'master'
Update spring to 1.6.4 to fix support for Bundler 1.11 See merge request !3083
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions