diff options
| author | Andre Arko <andre@arko.net> | 2015-01-24 12:45:08 -0800 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2015-01-24 12:45:42 -0800 |
| commit | a78e2d1aaf51a95faa19b6f1442dd1b632c4d30d (patch) | |
| tree | 163b34deb64e533cc8c28780bd31b91bf7617f19 /man/gemfile.5.ronn | |
| parent | 6f53d616b642e3baeb36464567253a5dfa5a7bef (diff) | |
| parent | 0aa8345b143e45d587124832f6949d7957eaa618 (diff) | |
| download | bundler-a78e2d1aaf51a95faa19b6f1442dd1b632c4d30d.tar.gz | |
Merge tag 'v1.7.12'
Version 1.7.12
Conflicts:
CHANGELOG.md
lib/bundler/fetcher.rb
spec/cache/platform_spec.rb
Diffstat (limited to 'man/gemfile.5.ronn')
| -rw-r--r-- | man/gemfile.5.ronn | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn index e6284478a1..876c927380 100644 --- a/man/gemfile.5.ronn +++ b/man/gemfile.5.ronn @@ -193,6 +193,8 @@ There are a number of `Gemfile` platforms: _mri_ `AND` version 2.0 * `mri_21`: _mri_ `AND` version 2.1 + * `mri_22`: + _mri_ `AND` version 2.2 * `rbx`: Same as _ruby_, but only Rubinius (not MRI) * `jruby`: @@ -209,12 +211,16 @@ There are a number of `Gemfile` platforms: _mingw_ `AND` version 2.0 * `mingw_21`: _mingw_ `AND` version 2.1 + * `mingw_22`: + _mingw_ `AND` version 2.2 * `x64_mingw`: Windows 64 bit 'mingw32' platform (aka RubyInstaller x64) * `x64_mingw_20`: _x64_mingw_ `AND` version 2.0 * `x64_mingw_21`: _x64_mingw_ `AND` version 2.1 + * `x64_mingw_22`: + _x64_mingw_ `AND` version 2.2 As with groups, you can specify one or more platforms: |