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

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

author	Tom Hughes <tom@compton.nu>
	Wed, 22 Aug 2012 19:52:08 +0000 (20:52 +0100)
committer	Tom Hughes <tom@compton.nu>
	Wed, 22 Aug 2012 19:52:08 +0000 (20:52 +0100)
commit	0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22
tree	a2a3cb46ca3524ea2c6c99e7722e0203212825ad	tree \| snapshot
parent	fe16fec000e8f26127f656bf68c513f2745b4059	commit \| diff
parent	a9a5b6ef38aeddcae590dfc53763ac303cadb8b0	commit \| diff

Merge branch 'master' into openstreetbugs

Conflicts:
Gemfile.lock
app/views/browse/_map.html.erb
app/views/user/view.html.erb
config/locales/en.yml
config/openlayers.cfg
db/structure.sql
vendor/assets/openlayers/OpenLayers.js

18 files changed:

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/common.css.scss	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/large.css	diff1 \|	diff2 \|	blob \| history
app/controllers/browse_controller.rb	diff1 \|	diff2 \|	blob \| history
app/helpers/application_helper.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/views/browse/_map.html.erb	diff1 \|	diff2 \|	blob \| history
app/views/site/index.html.erb	diff1 \|	diff2 \|	blob \| history
app/views/user/view.html.erb	diff1 \|	diff2 \|	blob \| history
config/example.application.yml	diff1 \|	diff2 \|	blob \| history
config/locales/de.yml	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
config/openlayers.cfg	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
db/structure.sql	diff1 \|	diff2 \|	blob \| history
test/functional/browse_controller_test.rb	diff1 \|	diff2 \|	blob \| history
vendor/assets/openlayers/OpenLayers.js	diff1 \|	diff2 \|	blob \| history

The OpenStreetMap web site

RSS Atom

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/common.css.scss	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/large.css	diff1 \|	diff2 \|	blob \| history
app/controllers/browse_controller.rb	diff1 \|	diff2 \|	blob \| history
app/helpers/application_helper.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/views/browse/_map.html.erb	diff1 \|	diff2 \|	blob \| history
app/views/site/index.html.erb	diff1 \|	diff2 \|	blob \| history
app/views/user/view.html.erb	diff1 \|	diff2 \|	blob \| history
config/example.application.yml	diff1 \|	diff2 \|	blob \| history
config/locales/de.yml	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
config/openlayers.cfg	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
db/structure.sql	diff1 \|	diff2 \|	blob \| history
test/functional/browse_controller_test.rb	diff1 \|	diff2 \|	blob \| history
vendor/assets/openlayers/OpenLayers.js	diff1 \|	diff2 \|	blob \| history