cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
openstreetmap-website/app
History
Tom Hughes d36fab2913 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	config/locales/en.yml
2010-04-20 00:41:03 +01:00
..
controllers Merge branch 'master' into openid 2010-04-20 00:41:03 +01:00
helpers Use a better HTML sanitizer that makes sure the HTML is well formed and 2010-03-06 15:38:13 +00:00
models Merge branch 'master' into openid 2010-04-20 00:41:03 +01:00
views Merge branch 'master' into openid 2010-04-20 00:41:03 +01:00