Samuel Clay 105dd1f576 Merge branch 'master' into ios_story ... * master: Adding blurblog permalink to story on blurblog. Adding story slug to permalink. Fixing story guid hashes. Re-enabling message property for facebook. Ignoring image for facebook shares. Commenting out facebook share message until they approve it. Cleaning up Facebook og description. Facebook using a website instead of article.		2012-11-27 12:28:22 -08:00
..
android	Merged fixes, bumped version number.	2012-10-22 14:08:06 -04:00
css	Merge branch 'master' into ios_story	2012-11-27 12:28:22 -08:00
extensions	Firefox manifest errors continue.	2012-04-21 18:35:22 -07:00
flash	New audio control, with Flash fallback for browsers like Firefox/IE.	2012-03-05 12:57:47 -08:00
fonts	Adding Gothic font for the star in the logo.	2011-07-31 14:17:04 -07:00
img	Adding bs facebook assets.	2012-11-20 09:54:36 -08:00
ios	Fixing paging issues on iOS.	2012-11-26 16:47:20 -08:00
js	Adding blurblog permalink to story on blurblog. Adding story slug to permalink. Fixing story guid hashes.	2012-11-27 11:59:54 -08:00
admin
crossdomain.xml	Protopub -> NewsBlur	2010-06-08 11:19:07 -04:00
embed	Relative to absolute urls for all embedded images.	2011-12-12 09:51:58 -08:00
robots.txt	Adding robots.txt so only the homepage will be crawled.	2011-01-04 08:56:25 -05:00