diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-26T19·14-0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-26T19·14-0400 |
| commit | 8c7910083976e255300efa797030448f5a1cb864 (patch) | |
| tree | afbd7a37d0724feb408a2d025364ed3938b5673a /version | |
| parent | aa115e22df1c80e8878237a9e704d7d70783a243 (diff) | |
| parent | 3a4623afbbc1bff85bde33167d36e8c5a4a3df0d (diff) | |
Merge branch 'master' into no-manifests
Diffstat (limited to 'version')
| -rw-r--r-- | version | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/version b/version index b123147e2a16..ea710abb95bc 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.1 \ No newline at end of file +1.2 \ No newline at end of file |