diff options
author | Christoph Helma <helma@in-silico.ch> | 2011-03-09 12:31:05 +0100 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2011-03-09 12:31:05 +0100 |
commit | c651fe10fe5e09dbfdf2b3abd420fc2fc0051937 (patch) | |
tree | 30029f9c3246de739aaf7b66a490c01b7b147f04 /VERSION | |
parent | 5233ab341757557c536ed8cc8eefd79a936b4295 (diff) | |
parent | 66f2ee967317954568562510111b0d832881547d (diff) |
Merge branch 'release/v1.0.0'v1.0.0
Conflicts:
lib/dataset.rb
Diffstat (limited to 'VERSION')
-rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -1.6.5 +1.0.0
\ No newline at end of file |