diff options
| author | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
| commit | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (patch) | |
| tree | edb73c6ae943629dbdc51d3350a50a079f7a2f7e /docs/examples/carousel | |
| parent | 04161a8c753c5f9ef83dd1f0848a17e8c4ab155c (diff) | |
| parent | 7f153974e10980dccbdd485e63941b591e925148 (diff) | |
| download | bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.tar.xz bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/assets/css/docs.css
Diffstat (limited to 'docs/examples/carousel')
| -rw-r--r-- | docs/examples/carousel/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index b985acbc3..3f53947b8 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -190,7 +190,7 @@ <!-- FOOTER --> <footer> <p class="pull-right"><a href="#">Back to top</a></p> - <p>© 2013 Company, Inc. · <a href="#">Privacy</a> · <a href="#">Terms</a></p> + <p>© 2014 Company, Inc. · <a href="#">Privacy</a> · <a href="#">Terms</a></p> </footer> </div><!-- /.container --> |