Merge branch 'master' of github.com:diaspora/diaspora
This commit is contained in:
commit
b4b3fd2bb3
1 changed files with 1 additions and 1 deletions
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
class NotificationsController < ApplicationController
|
||||
before_filter :authenticate_user!
|
||||
respond_to :html
|
||||
respond_to :html, :json
|
||||
|
||||
|
||||
def update
|
||||
|
|
|
|||
Loading…
Reference in a new issue