aboutsummaryrefslogtreecommitdiff
path: root/.themes/classic/source/_layouts/default.html
diff options
context:
space:
mode:
authorBrandon Mathis <brandon@imathis.com>2011-09-04 08:37:22 -0500
committerBrandon Mathis <brandon@imathis.com>2011-09-04 08:37:22 -0500
commited0c220523f81a9f29009f8bbb75ff50052465d4 (patch)
treeed925f206fc9d72fe806856a07525ec0118a3972 /.themes/classic/source/_layouts/default.html
parent3cedd387a0fd4522023ef335307cbc096a3c2005 (diff)
parentf03c4cdb2abe524e097fdfc67194e8d9fc0d19ab (diff)
downloadmy_new_personal_website-ed0c220523f81a9f29009f8bbb75ff50052465d4.tar.xz
my_new_personal_website-ed0c220523f81a9f29009f8bbb75ff50052465d4.zip
Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master
Conflicts: plugins/category_generator.rb
Diffstat (limited to '.themes/classic/source/_layouts/default.html')
-rw-r--r--.themes/classic/source/_layouts/default.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/.themes/classic/source/_layouts/default.html b/.themes/classic/source/_layouts/default.html
index 57147575..5523ac1b 100644
--- a/.themes/classic/source/_layouts/default.html
+++ b/.themes/classic/source/_layouts/default.html
@@ -9,5 +9,8 @@
</div>
</div>
<footer>{% include footer.html %}</footer>
+ {% include google_analytics.html %}
+ {% include google_plus_one.html %}
+ {% include twitter_sharing.html %}
</body>
</html>