From fa8e1cd38a17fb7a3299a535e8a5e92e8ab85145 Mon Sep 17 00:00:00 2001
From: Bjoern Kimminich <bjoern.kimminich@gmx.de>
Date: Sat, 10 Nov 2018 15:10:56 +0100
Subject: [PATCH] Lift code freeze for master-branch

[ci skip]
---
 CONTRIBUTING.md | 4 ----
 README.md       | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ddcb20931..a5c15b806 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,9 +1,5 @@
 # Contributing [![GitHub contributors](https://img.shields.io/github/contributors/bkimminich/juice-shop.svg)](https://github.com/bkimminich/juice-shop/graphs/contributors) [![Stories in Ready](https://badge.waffle.io/bkimminich/juice-shop.svg?label=ready&title=Ready)](http://waffle.io/bkimminich/juice-shop) [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
-> :snowman: **Code Freeze in effect for `master` branch!** :snowflake: Due to the preparations for the 8.x major release, code changes affecting 7.x
-> client-side and UI code (`/app/**`) will not be accepted in Pull Requests any more! If you would like to contribute to the new Angular6 client, please
-> code on `develop` branch of your fork only. The new UI lives in the `/frontend/**` directory.
-
 [![Build Status](https://travis-ci.org/bkimminich/juice-shop.svg?branch=master)](https://travis-ci.org/bkimminich/juice-shop)
 [![Build status](https://ci.appveyor.com/api/projects/status/903c6mnns4t7p6fa/branch/master?svg=true)](https://ci.appveyor.com/project/bkimminich/juice-shop/branch/master)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/2a7af720d39b08a09904/test_coverage)](https://codeclimate.com/github/bkimminich/juice-shop/test_coverage)
diff --git a/README.md b/README.md
index a756f0154..1284ce851 100644
--- a/README.md
+++ b/README.md
@@ -242,10 +242,6 @@ or question in the
 
 ## Contributing [![GitHub contributors](https://img.shields.io/github/contributors/bkimminich/juice-shop.svg)](https://github.com/bkimminich/juice-shop/graphs/contributors) [![Waffle.io - Columns and their card count](https://badge.waffle.io/bkimminich/juice-shop.svg?columns=all)](https://waffle.io/bkimminich/juice-shop) [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/owasp-juice-shop/localized.svg)](https://crowdin.com/project/owasp-juice-shop) [![Bountysource Activity](https://img.shields.io/bountysource/team/juice-shop/activity.svg)](https://www.bountysource.com/teams/juice-shop)
 
-> :snowman: **Code Freeze in effect for `master` branch!** :snowflake: Due to the preparations for the 8.x major release, code changes affecting 7.x
-> client-side and UI code (`/app/**`) will not be accepted in Pull Requests any more! If you would like to contribute to the new Angular6 client, please
-> code on `develop` branch of your fork only. The new UI lives in the `/frontend/**` directory.
-
 We are always happy to get new contributors on board! Please check the
 following table for possible ways to do so:
 
-- 
GitLab