diff options
| author | Mark Otto <[email protected]> | 2013-08-06 18:29:54 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-06 18:29:54 -0700 |
| commit | 402dbfb6171e18aa44e19429e796169f02b0adf7 (patch) | |
| tree | aeb0cef7cc1b04988307a0ef79b07fbe2d7d197c /_includes/ads.html | |
| parent | 7e19b6b02ccd5417a6c2d3d418c08219773f1112 (diff) | |
| parent | 41bdd1a4823feb8b46b2fccfeec3e9c5057a0665 (diff) | |
| download | bootstrap-402dbfb6171e18aa44e19429e796169f02b0adf7.tar.xz bootstrap-402dbfb6171e18aa44e19429e796169f02b0adf7.zip | |
Merge branch '3.0.0-wip' into bs3_theme
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to '_includes/ads.html')
| -rw-r--r-- | _includes/ads.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_includes/ads.html b/_includes/ads.html index 495e7ba47..ba4775f5e 100644 --- a/_includes/ads.html +++ b/_includes/ads.html @@ -1 +1 @@ -<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
\ No newline at end of file +<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script>var z = document.createElement("script"); z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div> |