Merge branch 'master' into feature/refactor-offerings-reference

hardforkio · Nov 7, 2019 · 6719f97 · 6719f97
2 parents 1b1d5aa + 23cba36
commit 6719f97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/pages/imprint.tsx b/src/pages/imprint.tsx
@@ -9,7 +9,7 @@ const ImprintPage: FunctionComponent<{}> = () => {
 
   return (
     <NavbarStateProvider>
-      <Layout isHeaderTransparent={false}>
+      <Layout>
         <Imprint imprint={imprints[0]} />
       </Layout>
     </NavbarStateProvider>

diff --git a/static/admin/config.yml b/static/admin/config.yml
@@ -1,7 +1,7 @@
 backend:
   name: git-gateway
   repo: hardforkio/homepage
-  branch: feature/issue-93--add-netlify-cms
+  branch: master
 
 media_folder: "static/img"
 public_folder: "/img"