diff --git a/CHANGES.txt b/CHANGES.txt index 285545c7b86..a8e66376ff0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -231,6 +231,8 @@ Other Changes 12. SOLR-885: NamedListCodec is renamed to JavaBinCodec and returns Object instead of NamedList. (Noble Paul, yonik via shalin) +13. SOLR-84: Use new Solr logo in admin (Michiel via koji) + Build ---------------------- 1. SOLR-776: Added in ability to sign artifacts via Ant for releases (gsingers) diff --git a/client/ruby/flare/app/views/layouts/browse.rhtml b/client/ruby/flare/app/views/layouts/browse.rhtml index 86d1d46218b..cc1fea4d1bf 100755 --- a/client/ruby/flare/app/views/layouts/browse.rhtml +++ b/client/ruby/flare/app/views/layouts/browse.rhtml @@ -7,9 +7,9 @@
<%= yield %>
- \ No newline at end of file + diff --git a/client/ruby/flare/public/images/solr.png b/client/ruby/flare/public/images/solr.png deleted file mode 100755 index a02bee8b0cf..00000000000 Binary files a/client/ruby/flare/public/images/solr.png and /dev/null differ diff --git a/client/ruby/flare/public/images/solr_small.png b/client/ruby/flare/public/images/solr_small.png new file mode 100644 index 00000000000..326e3cd5771 Binary files /dev/null and b/client/ruby/flare/public/images/solr_small.png differ diff --git a/client/ruby/flare/vendor/plugins/flare/app/views/layouts/browse.rhtml b/client/ruby/flare/vendor/plugins/flare/app/views/layouts/browse.rhtml index 86d1d46218b..cc1fea4d1bf 100755 --- a/client/ruby/flare/vendor/plugins/flare/app/views/layouts/browse.rhtml +++ b/client/ruby/flare/vendor/plugins/flare/app/views/layouts/browse.rhtml @@ -7,9 +7,9 @@
<%= yield %>
- \ No newline at end of file + diff --git a/src/test/test-files/htmlStripReaderTest.html b/src/test/test-files/htmlStripReaderTest.html index 04e6cc1b39e..64cc3acd351 100755 --- a/src/test/test-files/htmlStripReaderTest.html +++ b/src/test/test-files/htmlStripReaderTest.html @@ -39,7 +39,7 @@ |start Project Logo +-->