Merge branch 'develop' into feature/billing-no-authenticated-payments

Conflicts:
	billing/config/locales/en.yml

1 files changed, 3 insertions, 2 deletions

diff --git a/users/config/routes.rb b/users/config/routes.rb
index ccecfd5..de2ff37 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -13,13 +13,14 @@ Rails.application.routes.draw do
 
   get "signup" => "users#new", :as => "signup"
   resources :users, :except => [:create, :update] do
-    resource :overview, :only => [:show]
     # resource :email_settings, :only => [:edit, :update]
-    resources :email_aliases, :only => [:destroy], :id => /.*/
+    # resources :email_aliases, :only => [:destroy], :id => /.*/
     post 'deactivate', on: :member
     post 'enable', on: :member
   end
 
   get "/.well-known/host-meta" => 'webfinger#host_meta'
   get "/webfinger" => 'webfinger#search'
+  get "/key/:login" => 'keys#show'
+
 end