Merge branch 'master' into feature/add-communities-page

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index e45d56701ef6dde5c99abc131d0872371acf250b..2de4ab2acad7c2e31c2d99c20f7118fa05940304 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -147,6 +147,7 @@ OpenStreetMap::Application.routes.draw do
   get "/help" => "site#help"
   get "/about/:about_locale" => "site#about"
   get "/about" => "site#about"
   get "/help" => "site#help"
   get "/about/:about_locale" => "site#about"
   get "/about" => "site#about"

+  get "/communities" => "site#communities"

   get "/history" => "changesets#index"
   get "/history/feed" => "changesets#feed", :defaults => { :format => :atom }
   get "/history/comments/feed" => "changeset_comments#index", :as => :changesets_comments_feed, :defaults => { :format => "rss" }
   get "/history" => "changesets#index"
   get "/history/feed" => "changesets#feed", :defaults => { :format => :atom }
   get "/history/comments/feed" => "changeset_comments#index", :as => :changesets_comments_feed, :defaults => { :format => "rss" }