diff options
| author | Florian Frank <flori@ping.de> | 2010-04-08 02:40:45 +0200 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2010-04-08 02:40:45 +0200 |
| commit | b2a5be0eef9095154cc8c7751d0318a565dad6da (patch) | |
| tree | 386b576e336bcd9e6c82b59aaec45c70f56fcb55 /VERSION | |
| parent | c3e8dd92f04b010366e4d7152c83c7486af93e1e (diff) | |
| parent | a294a83f4d22901651d09c06063eb20d3b2290b8 (diff) | |
| download | json-b2a5be0eef9095154cc8c7751d0318a565dad6da.tar.gz | |
Merged in const_missing triggering from v1.2
Merge commit 'a294a83f4d22901651d09c06063eb20d3b2290b8'
Conflicts:
VERSION
lib/json/version.rb
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions