Merge branch 'master' into dev

vikasrohit · web-flow · commit 2e8d09bdc35a · 2018-12-11T15:59:42.000+05:30
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -82,7 +82,7 @@ workflows:
       - "build-dev":
           filters:
             branches:
-              only: [dev, 'feature/auth0-proxy-server']
+              only: [dev]
       - "build-prod":
           filters:
             branches:
