diff options
author | Florian Frank <flori@ping.de> | 2011-12-21 11:05:46 +0100 |
---|---|---|
committer | Florian Frank <flori@ping.de> | 2011-12-21 11:05:46 +0100 |
commit | 60ef7adb347b473cbcce9aacacb2943ae5fb4d4c (patch) | |
tree | ba73bea0660d74b2a9a787c5e0acd1a06739e1b6 /VERSION | |
parent | 0dacb54bcdf3c40cc38dae26f04b780024460b45 (diff) | |
parent | 59ecfad89281873fe72234b62545294b5fa7ba95 (diff) | |
download | json-60ef7adb347b473cbcce9aacacb2943ae5fb4d4c.tar.gz |
Merge branch 'master' of https://github.com/MagLev/json into MagLev-masterMagLev-master
Diffstat (limited to 'VERSION')
-rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -1.6.1 +1.6.3 |