diff options
| author | Thomas McDonald <tom@conceptcoding.co.uk> | 2013-09-09 14:38:35 +0400 |
|---|---|---|
| committer | Thomas McDonald <tom@conceptcoding.co.uk> | 2013-09-09 14:38:35 +0400 |
| commit | 544ad6c18af788582c62ef578587dcd0ae58b363 (patch) | |
| tree | 1897e4d77b68479eb2f2fb38263fb5eb872e3855 /CHANGELOG.md | |
| parent | 2f69aef9608a882d3d4fd2fdef7fc641df60d256 (diff) | |
| parent | 1344c58711e9ba30cbbd028908ea3fe6df73969d (diff) | |
Merge branch '3'
This isn't quite finished, but we can work on the issues on master
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 81a1c2e..80c5e01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 3.0.0.0 +* Ported rake task from vwall/compass-twitter-bootstrap to convert Bootstrap upstream - *Peter Gumeson* +* Moved javascripts from `bootstrap-component.js` to `bootstrap/component.js` - *Peter Gumeson* + ## 2.3.2.2 * Allow sass-rails `>= 3.2` - *Thomas McDonald* |