Merge branch 'next-minor' into develop

This commit is contained in:
Dennis Schubert 2016-11-06 02:41:12 +01:00
commit 48cb2aca1d
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E

View file

@ -102,7 +102,6 @@ Diaspora::Application.routes.draw do
resource :user, only: %i(edit destroy), shallow: true do
put :edit, action: :update
get :getting_started_completed
post :export_profile
get :download_profile
post :export_photos