diff options
| author | Mark Otto <[email protected]> | 2014-06-08 13:57:44 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-08 13:57:44 -0700 |
| commit | d1872b4c98f26b1bfcd7e007133b97e6602dd0d0 (patch) | |
| tree | ccc12bda1d6df512fbc9c4023b296f46a6f05e3f /composer.json | |
| parent | 5872a7e0aca5e2b5b8e0be5df8b2a7cdf987d805 (diff) | |
| parent | 5cd72ce23058b47a739c7e2005ab5c3d4e28ff30 (diff) | |
| download | bootstrap-d1872b4c98f26b1bfcd7e007133b97e6602dd0d0.tar.xz bootstrap-d1872b4c98f26b1bfcd7e007133b97e6602dd0d0.zip | |
Merge branch 'master' into pr/13736
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/composer.json b/composer.json index 82efb816c..1b8146d60 100644 --- a/composer.json +++ b/composer.json @@ -30,5 +30,8 @@ "branch-alias": { "dev-master": "3.1.x-dev" } + }, + "replace": { + "twitter/bootstrap": "self.version" } } |