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: ffd7b02 1eba060)

author	Tom Hughes <tom@compton.nu>
	Fri, 7 May 2010 21:23:20 +0000 (22:23 +0100)
committer	Tom Hughes <tom@compton.nu>
	Fri, 7 May 2010 21:23:20 +0000 (22:23 +0100)
commit	303e5d3eb99284ab4fa41be85f831333f2154b0d
tree	3a9176d91e00ada570be50caad950fa8c2d5eb4d	tree \| snapshot
parent	ffd7b02b0c3696ffa5d38ddeeb8078df19e841e0	commit \| diff
parent	1eba0609296c8208fd69062a189371c05ebce11e	commit \| diff

Merge branch 'master' into terms

Conflicts:
config/application.yml
lib/osm.rb
public/stylesheets/common.css

app/controllers/user_controller.rb	diff1 \|	diff2 \|	blob \| history
config/application.yml	diff1 \|	diff2 \|	blob \| history
config/environment.rb	diff1 \|	diff2 \|	blob \| history
config/locales/de.yml	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
lib/osm.rb	diff1 \|	diff2 \|	blob \| history
public/stylesheets/common.css	diff1 \|	diff2 \|	blob \| history

The OpenStreetMap web site