Skip to content

Commit d9420c4

Browse files
committed
bump to v3.1.1 and update changelog
1 parent 9b9365f commit d9420c4

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
# Changelog
22

3+
## 3.1.1.0
4+
5+
- Updated Bower docs
6+
37
## 3.1.0.2
48

5-
Compatibility with Rails 3.2.x. Bugfixes from upstream up to 7eb532262fbd1112215b5a547b9285794b5360ab.
9+
- #523: Rails 3.2 compatibility
10+
- Bugfixes from upstream up to 7eb532262fbd1112215b5a547b9285794b5360ab.
611

712
## 3.1.0.1
813

9-
* bugfixes
14+
- #518: `scale` mixin Sass compatibility issue
1015

1116
## 3.1.0.0
1217

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `s
1616

1717
```ruby
1818
gem 'sass-rails', '>= 3.2' # sass-rails needs to be higher than 3.2
19-
gem 'bootstrap-sass', '~> 3.1.0'
19+
gem 'bootstrap-sass', '~> 3.1.1'
2020
```
2121

2222
`bundle install` and restart your server to make the files available through the pipeline.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-sass",
3-
"version": "3.1.0",
3+
"version": "3.1.1",
44
"homepage": "https://github.com/twbs/bootstrap-sass",
55
"authors": [
66
"Thomas McDonald",

lib/bootstrap-sass/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module Bootstrap
2-
VERSION = '3.1.0.2'
2+
VERSION = '3.1.1.0'
33
BOOTSTRAP_SHA = 'd8cfcad7c71a2b65325b36718c218fee4221e663'
44
end

0 commit comments

Comments
 (0)