Samuel Clay c6dda3744d Merge branch 'master' into social ... * master: New preference: delay to mark a story as read. Closing #52: Adding delicious to sharing services and preferences. Thanks @palewire for the suggestion. Conflicts: media/css/reader.css media/js/newsblur/reader/reader.js media/js/newsblur/reader/reader_keyboard.js		2012-05-07 15:23:56 -07:00
..
chrome	Adding Chrome Web Store banners + screenshots + originals.	2011-10-25 21:25:56 -07:00
firefox	Firefox App Marketplace banner + original.	2012-04-22 13:24:39 -07:00
icons	Last few fixes for the folder counts always visible change. Now refreshed feeds update folder counts.	2011-11-01 00:20:06 -07:00
iphone	Finishign up interaction of iphone app trailer page. Need auto switching.	2011-12-08 10:52:36 -08:00
mobile	New asset for iPad bookmarks.	2012-04-20 08:45:42 -07:00
originals	Firefox App Marketplace banner + original.	2012-04-22 13:24:39 -07:00
reader	Merge branch 'master' into social	2012-05-07 15:23:56 -07:00
static	Screenshots added to press page. Press Page is now complete!	2011-04-24 11:20:22 -04:00
favicon.png	LOGOS! New Favicon! New NewsBlur! New Logo!	2011-03-10 22:07:29 -05:00
logo_128.png	Updating Chrome extension and logo_128.	2011-03-11 19:48:19 -05:00
logo_512.png	Logos.	2011-03-17 23:52:57 -04:00
logo_newsblur.png	LOGOS! New Favicon! New NewsBlur! New Logo!	2011-03-10 22:07:29 -05:00
logo_newsblur_512.png	Logos.	2011-03-17 23:52:57 -04:00
logo_newsblur_blur.png	Updating logos a bit. Adding transparency to the blur. Saving in original.	2011-03-11 00:39:09 -05:00