Merge branch 'media-display-option' into 'develop'

Add media display option to Preferences See merge request soapbox-pub/soapbox-fe!374
2020-10-28 17:04:46 +00:00 · 2020-10-28 17:04:46 +00:00 · c59ad985e5
commit c59ad985e5
parent fd70807833 b8f88f807b
3 changed files with 1 additions and 1 deletions
--- a/app/soapbox/features/forms/tests/snapshots/forms-test.js.snap
+++ b/app/soapbox/features/forms/tests/snapshots/forms-test.js.snap
@ -56,7 +56,7 @@ exports[`<RadioGroup /> renders correctly 1`] = `

 exports[`<SelectDropdown /> renders correctly 1`] = `
 <div
-  class="select-wrapper"
+  className="select-wrapper"
 >
  <select>
    <option
--- a/app/soapbox/features/forms/index.js
+++ b/app/soapbox/features/forms/index.js
--- a/app/soapbox/features/preferences/index.js
+++ b/app/soapbox/features/preferences/index.js