Merge branch 'master' of /Users/r/Dropbox/git-repo/contactorama

This commit is contained in:
Roland Jesse 2012-01-12 21:16:34 +01:00
commit 58b1849cd8
9 changed files with 61 additions and 12 deletions

View file

@ -3,7 +3,11 @@ ContactORama::Application.routes.draw do
devise_for :users
resources :users
resources :birthdays
resources :birthdays do
collection do
post :do_mailing
end
end
resources :contacts
match 'uielements/' => 'uielements#index'