Samuel Clay 729fa13e5c Merge branch 'jstricks' ... * jstricks: Fixing footnotes. Remvoing bigfoot.js. It's just not meant for multiple instantiations per-page. Adding highlight.js, bigfoot.js, and fitvid.js. Bigfoot needs love. Conflicts: media/js/newsblur/views/story_detail_view.js		2014-01-06 12:10:55 -08:00
..
mobile	Cleaning up unfetched feeds and finishing rewrite of refreshing feeds.	2012-05-22 17:39:21 -07:00
newsblur	Merge branch 'jstricks'	2014-01-06 12:10:55 -08:00
vendor	Remvoing bigfoot.js. It's just not meant for multiple instantiations per-page.	2014-01-05 14:55:53 -08:00