Samuel Clay a3e974f329 Merge branch 'master' into recommended ... Conflicts: media/css/reader.css		2011-03-11 19:53:45 -05:00
..
api	Fixing bookmarklet just on the page. Now different between drag and use on another site.	2011-01-24 09:58:16 -05:00
import	Google Reader import now allows you to create an account after you import your feeds. Also highlighted on front page.	2010-07-05 17:11:04 -04:00
reader	Merge branch 'master' into recommended	2011-03-11 19:53:45 -05:00
recommendations	Dear lord this is some crazy attention to detail. Only show the spinner on the New Features module if the request has taken longer than 50ms, otherwise it just looks instantaneous, not spinner needed. Whew.	2011-03-04 12:45:31 -05:00
rss_feeds	Fixing misc number errors in status page.	2011-03-01 10:26:28 -05:00
404.html	Protopub -> NewsBlur	2010-06-08 11:19:07 -04:00
500.html	Protopub -> NewsBlur	2010-06-08 11:19:07 -04:00
base.html	Adding opml export links to Add Site dialog and Preferences dialog.	2011-03-11 11:22:28 -05:00