aboutsummaryrefslogtreecommitdiff
path: root/ruby/Gemfile.lock
diff options
context:
space:
mode:
authorJan Tattermusch <jtattermusch@google.com>2015-05-13 13:35:02 -0700
committerJan Tattermusch <jtattermusch@google.com>2015-05-13 13:35:02 -0700
commit41113108303afbc1458c1c82b267cc17703ea8ce (patch)
tree70ee5f7e6d383fbc5f125daf1b54e1e0766ab1b1 /ruby/Gemfile.lock
parent3bc162a8ace489bc8a62c5e715f7bf673bd8db75 (diff)
parent23bb79d4a32a77e8349d6c49052be1e56a8b8153 (diff)
downloadprotobuf-41113108303afbc1458c1c82b267cc17703ea8ce.tar.gz
protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.tar.bz2
protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.zip
Merge branch 'master' of github.com:google/protobuf into integrate_from_master
Diffstat (limited to 'ruby/Gemfile.lock')
-rw-r--r--ruby/Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index 89deb47d..6f349276 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- google-protobuf (3.0.0.alpha.2)
+ google-protobuf (3.0.0.alpha.3.1.pre)
GEM
remote: https://rubygems.org/