Locally host minified jquery.js
Merge pull request #88 from printfcc-members/upstream

Locally host minified jquery.js
Fix author label background being invisible
Merge pull request #82 from ingwinlu/master

fixed missing </ul> tag in sidebar
Merge pull request #92 from printfcc-members/to-pull

Fix author label background being invisible
Mimetype for RSS feed is application/rss+xml, not application/atom+xml, fixes #94
Added article:author open graph tag and showing author/category on article is now configurable
pre upstream merge
Merge branch 'master' of github.com:DandyDev/pelican-bootstrap3

Conflicts:
	templates/base.html