git.openstreetmap.org Git - rails.git/commit

]> git.openstreetmap.org Git - rails.git/commit

Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb
app/views/user/terms.html.erb
test/fixtures/users.yml

The OpenStreetMap web site

app/controllers/user_controller.rb	diff1 \|	diff2 \|	blob \| history
app/views/user/account.html.erb	diff1 \|	diff2 \|	blob \| history
app/views/user/terms.html.erb	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
config/locales/is.yml	diff1 \|	diff2 \|	blob \| history
public/stylesheets/common.css	diff1 \|	diff2 \|	blob \| history
public/stylesheets/small.css	diff1 \|	diff2 \|	blob \| history
test/fixtures/users.yml	diff1 \|	diff2 \|	blob \| history
test/integration/user_blocks_test.rb	diff1 \|	diff2 \|	blob \| history