Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/removing_ruby_junk

2020-12-09 00:00:35 -05:00
parent bb7348fc61 c18991f174
commit 586935f07f
28 changed files with 827 additions and 7 deletions
--- a/app/javascript/gabsocial/layouts/about_layout.js
+++ b/app/javascript/gabsocial/layouts/about_layout.js
@@ -53,6 +53,10 @@ class AboutLayout extends React.PureComponent {
        title: 'Terms of Service',
        to: '/about/tos',
      },
+      {
+        title: 'California Consumer Protection',
+        to: '/about/ccpa',
+      },
    ]
  }