diff options
| author | Mark Otto <[email protected]> | 2013-01-11 10:58:17 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-01-11 10:58:17 -0800 |
| commit | 98b0d4946f187e5e5145fc8a218d1d0f9b58e4d7 (patch) | |
| tree | 0a6b6fbf7aec7ca34c342712bb90d3cc878dc04d | |
| parent | a2854c830701a6ae21e4159e84b4245c9bf4dd65 (diff) | |
| parent | e7a13a94168c9a83898ab1d549b8ced22b42774c (diff) | |
| download | bootstrap-98b0d4946f187e5e5145fc8a218d1d0f9b58e4d7.tar.xz bootstrap-98b0d4946f187e5e5145fc8a218d1d0f9b58e4d7.zip | |
Merge branch 'wilfra-patch-2' into 2.3.0-wip
| -rw-r--r-- | carousel.html | 2 | ||||
| -rw-r--r-- | fluid.html | 2 | ||||
| -rw-r--r-- | hero.html | 2 | ||||
| -rw-r--r-- | justified-nav.html | 2 | ||||
| -rw-r--r-- | marketing-narrow.html | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/carousel.html b/carousel.html index 32fca5d73..30053e4be 100644 --- a/carousel.html +++ b/carousel.html @@ -418,7 +418,7 @@ <!-- FOOTER --> <footer> <p class="pull-right"><a href="#">Back to top</a></p> - <p>© 2012 Company, Inc. · <a href="#">Privacy</a> · <a href="#">Terms</a></p> + <p>© 2013 Company, Inc. · <a href="#">Privacy</a> · <a href="#">Terms</a></p> </footer> </div><!-- /.container --> diff --git a/fluid.html b/fluid.html index 4ca2920ef..f08661aec 100644 --- a/fluid.html +++ b/fluid.html @@ -128,7 +128,7 @@ <hr> <footer> - <p>© Company 2012</p> + <p>© Company 2013</p> </footer> </div><!--/.fluid-container--> @@ -100,7 +100,7 @@ <hr> <footer> - <p>© Company 2012</p> + <p>© Company 2013</p> </footer> </div> <!-- /container --> diff --git a/justified-nav.html b/justified-nav.html index 18135c9aa..9071a8d81 100644 --- a/justified-nav.html +++ b/justified-nav.html @@ -148,7 +148,7 @@ <hr> <div class="footer"> - <p>© Company 2012</p> + <p>© Company 2013</p> </div> </div> <!-- /container --> diff --git a/marketing-narrow.html b/marketing-narrow.html index 9ce1cd5bc..996f8a1da 100644 --- a/marketing-narrow.html +++ b/marketing-narrow.html @@ -111,7 +111,7 @@ <hr> <div class="footer"> - <p>© Company 2012</p> + <p>© Company 2013</p> </div> </div> <!-- /container --> |