Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
MrZYX 2011-02-14 21:50:54 +01:00
commit b4b3fd2bb3

View file

@ -4,7 +4,7 @@
class NotificationsController < ApplicationController class NotificationsController < ApplicationController
before_filter :authenticate_user! before_filter :authenticate_user!
respond_to :html respond_to :html, :json
def update def update