Merge remote-tracking branch 'upstream/pull/2434'

[rails.git] / app / views / messages / destroy.json.jbuilder

diff --git a/app/views/messages/destroy.json.jsonify b/app/views/messages/destroy.json.jbuilder
similarity index 100%
rename from app/views/messages/destroy.json.jsonify
rename to app/views/messages/destroy.json.jbuilder