update with changes from Production branch

2014-02-17 12:05:39 -05:00
parent 5b640cf9d8
commit a4937fb2e5
384 changed files with 14690 additions and 2242 deletions
--- a/app/views/feed/index.html.erb
+++ b/app/views/feed/index.html.erb
@@ -1 +1 @@
-<%= render :partial => 'index.json.erb' %>
+<%= render :partial => 'feed/index.json.erb' %>