diff options
| author | Mark Otto <[email protected]> | 2014-03-10 00:08:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-10 00:08:29 -0700 |
| commit | a36643dd338537a9b4319fbab6e1dbf2e7d1cf9c (patch) | |
| tree | a097e839bc115709770b6e1b533a63bf653e58f0 /js/tests | |
| parent | 3a2d6e40503019823bf197f278681e830bc14f31 (diff) | |
| parent | 6dd51fab44df852697564f6257403b57f85f492b (diff) | |
| download | bootstrap-a36643dd338537a9b4319fbab6e1dbf2e7d1cf9c.tar.xz bootstrap-a36643dd338537a9b4319fbab6e1dbf2e7d1cf9c.zip | |
Merge branch 'master' into modular-the-mixins
Conflicts:
dist/css/bootstrap.css.map
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
Diffstat (limited to 'js/tests')
| -rw-r--r-- | js/tests/unit/phantom.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tests/unit/phantom.js b/js/tests/unit/phantom.js index bf480ecaa..cd184c2f4 100644 --- a/js/tests/unit/phantom.js +++ b/js/tests/unit/phantom.js @@ -2,7 +2,7 @@ * grunt-contrib-qunit * http://gruntjs.com/ * - * Copyright (c) 2013 'Cowboy' Ben Alman, contributors + * Copyright (c) 2013 "Cowboy" Ben Alman, contributors * Licensed under the MIT license. */ |