Samuel Clay 20195f4345 Merge branch 'master' into chooser ... Conflicts: media/js/newsblur/reader_classifier.js media/js/newsblur/reader_manage_feed.js media/js/underscore.js		2010-10-22 09:56:06 -04: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	Adding paypal return screen, which holds the user until paypal ipn kicks in and their feeds are converted.	2010-10-19 19:09:08 -04: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	Merge branch 'master' into chooser	2010-10-22 09:56:06 -04:00