Commit b4b3fd2b authored by MrZYX's avatar MrZYX

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

parents fbaf9d6e 4111a0ae
......@@ -4,7 +4,7 @@
class NotificationsController < ApplicationController
before_filter :authenticate_user!
respond_to :html
respond_to :html, :json
def update
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment