Samuel Clay 69bf581cd2 Merge branch 'master' into social ... * master: Adding story permalink to story context-menu. Thanks to @grammargirl for the idea. Adding task servers and updating automated deploy. Removing dupe unique index in prep for social. Adding 3 new task servers. Conflicts: apps/analyzer/models.py fabfile.py media/js/newsblur/reader/reader.js utils/feed_fetcher.py		2012-05-17 13:27:29 -07:00
..
css	Merge branch 'master' into social	2012-05-17 13:27:29 -07: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	Merge branch 'master' into social	2012-05-07 15:23:56 -07:00
iphone	Merge branch 'master' into social	2012-03-20 10:33:15 -07:00
js	Merge branch 'master' into social	2012-05-17 13:27:29 -07:00
admin	Switching to mod_wsgi from mod_python, adding nginx, and adding like/dislike buttons.	2009-07-05 18:15:58 +00:00
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
maintenance.html.unused	Ignoring files.	2012-02-08 12:47:00 -08:00
robots.txt	Adding robots.txt so only the homepage will be crawled.	2011-01-04 08:56:25 -05:00