Merge remote-tracking branch 'upstream/pull/5933'

diff --git a/app/assets/images/cc_button.png b/app/assets/images/cc_button.png
deleted file mode 100644 (file)
index 5749f65..0000000
Binary files a/app/assets/images/cc_button.png and /dev/null differ

diff --git a/app/views/changesets/index.atom.builder b/app/views/changesets/index.atom.builder
index 6556f12bfe1641f54d79522abfb71510a2d3fb9b..cd437c6378b87d25a1ca5b5bb4a5e8a1a2673f15 100644 (file)
--- a/app/views/changesets/index.atom.builder
+++ b/app/views/changesets/index.atom.builder
@@ -10,9 +10,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
   feed.logo image_url("mag_map-rss2.0.png")
 
   feed.rights :type => "xhtml" do |xhtml|
-    xhtml.a :href => "https://creativecommons.org/licenses/by-sa/2.0/" do |a|
-      a.img :src => image_url("cc_button.png"), :alt => "CC by-sa 2.0"
-    end
+    xhtml.a "Open Data Commons Open Database License", :href => "https://opendatacommons.org/licenses/odbl/"
   end
 
   @changesets.each do |changeset|