Merge branch 'master' of https://git.ece.iastate.edu/danc/MicroCART_17-18

438c0e8a · David Wehr · 5f1199a8 · 0f528c51 · 438c0e8a · 438c0e8a
Commit 438c0e8a authored 8 years ago by David Wehr
--- a/website/themes/notmyidea/templates/analytics.html
+++ b/website/themes/notmyidea/templates/analytics.html
--- a/website/themes/notmyidea/templates/archives.html
+++ b/website/themes/notmyidea/templates/archives.html
--- a/website/themes/notmyidea/templates/article.html
+++ b/website/themes/notmyidea/templates/article.html
--- a/website/themes/notmyidea/templates/article_infos.html
+++ b/website/themes/notmyidea/templates/article_infos.html
--- a/website/themes/notmyidea/templates/author.html
+++ b/website/themes/notmyidea/templates/author.html
--- a/website/themes/notmyidea/templates/authors.html
+++ b/website/themes/notmyidea/templates/authors.html
--- a/website/themes/notmyidea/templates/base.html
+++ b/website/themes/notmyidea/templates/base.html
--- a/website/themes/notmyidea/templates/category.html
+++ b/website/themes/notmyidea/templates/category.html
--- a/website/themes/notmyidea/templates/comments.html
+++ b/website/themes/notmyidea/templates/comments.html
--- a/website/themes/notmyidea/templates/disqus_script.html
+++ b/website/themes/notmyidea/templates/disqus_script.html
--- a/website/themes/notmyidea/templates/github.html
+++ b/website/themes/notmyidea/templates/github.html
--- a/website/themes/notmyidea/templates/index.html
+++ b/website/themes/notmyidea/templates/index.html
--- a/website/themes/notmyidea/templates/page.html
+++ b/website/themes/notmyidea/templates/page.html
--- a/website/themes/notmyidea/templates/period_archives.html
+++ b/website/themes/notmyidea/templates/period_archives.html
--- a/website/themes/notmyidea/templates/tag.html
+++ b/website/themes/notmyidea/templates/tag.html
--- a/website/themes/notmyidea/templates/taglist.html
+++ b/website/themes/notmyidea/templates/taglist.html
--- a/website/themes/notmyidea/templates/tags.html
+++ b/website/themes/notmyidea/templates/tags.html
--- a/website/themes/notmyidea/templates/translations.html
+++ b/website/themes/notmyidea/templates/translations.html
--- a/website/themes/notmyidea/templates/twitter.html
+++ b/website/themes/notmyidea/templates/twitter.html