diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2014-11-20 06:48:16 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2014-11-20 06:48:16 +0200 |
commit | f8fc4f6ab094ba8a2060ce3c297920d89c41ffd5 (patch) | |
tree | 6351555a27e5843bf44c53d8976c81a301654c91 /version | |
parent | c67e46e198b05530f79e11c86dde63b68a6d5906 (diff) | |
parent | f5826c7da4cc11d46a34e4a5e435cff2730c7263 (diff) |
Merge branch 'master' into bulk
Diffstat (limited to 'version')
-rw-r--r-- | version | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -2.4.0.a3 +2.4.0.a4 |