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

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

projects / rails.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 684aad1 1eba060)

author	Tom Hughes <tom@compton.nu>
	Fri, 7 May 2010 21:28:07 +0000 (22:28 +0100)
committer	Tom Hughes <tom@compton.nu>
	Fri, 7 May 2010 21:28:07 +0000 (22:28 +0100)
commit	f85681c5cee9406aacc1745a3fb3bd0331d3c0e4
tree	c6c0e7b1ab8cb7d59061b6c914854f7964e3ca1d	tree \| snapshot
parent	684aad13df709cb3e606be85dc29fcfc15341158	commit \| diff
parent	1eba0609296c8208fd69062a189371c05ebce11e	commit \| diff

Merge branch 'master' into openid

Conflicts:
app/controllers/user_controller.rb

app/controllers/user_controller.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
config/environment.rb	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
public/stylesheets/common.css	diff1 \|	diff2 \|	blob \| history
test/fixtures/users.yml	diff1 \|	diff2 \|	blob \| history

The OpenStreetMap web site