Samuel Clay 58591e5022 Merge branch 'master' into social ... * master: Being much more aggressive about certain sites trying to take over the iframe. Blocking nytimes.com, twitter.com, and stackoverflow.com from even allowing an Original view. Conflicts: media/css/reader.css		2012-05-07 16:27:55 -07:00
..
common	Fixing opening tryfeeds when they have been opened before.	2012-05-04 15:49:39 -07:00
models	Cleanup.	2012-04-25 12:18:26 -07:00
payments	Moving stripe into payments folder.	2012-02-29 16:22:58 -08:00
reader	Merge branch 'master' into social	2012-05-07 16:27:55 -07:00
static	Rearranging javascript. Also backbonizing user models for follower and following collections.	2012-01-04 09:42:35 -08:00
views	Updating followers in profile when following/unfollowing.	2012-04-21 16:14:53 -07:00