Tom Hughes e660e60966 Merge branch 'master' into openstreetbugs ... Conflicts: Gemfile Gemfile.lock lib/migrate.rb		2012-03-08 18:23:27 +00:00
..
images	Merge branch 'master' into openstreetbugs	2012-03-08 18:23:27 +00:00
javascripts	Merge branch 'master' into openstreetbugs	2012-03-08 18:23:27 +00:00
openlayers/theme/default	Force all OpenLayers resources to load through the asset pipeline	2011-11-25 23:00:30 +00:00
opensearch	Serve OpenSearch definition though the assets pipeline	2011-12-30 22:37:11 +00:00
stylesheets	Merge branch 'master' into openstreetbugs	2012-03-08 18:23:27 +00:00
swfobject	Serve swfobject via the assets pipeline	2011-11-14 09:42:56 +00:00