Merge remote-tracking branch 'origin/pre-release-cleanup' into pre-release-cleanup

epic-alex-rodionov · epic-alex-rodionov · commit f84e74e94c3b · 2019-04-24T14:02:46.000+03:00
# Conflicts:
#	README.md
#	browserup-proxy-core/src/main/java/com/browserup/bup/filters/HarCaptureFilter.java
#	build.gradle
diff --git a/README.md b/README.md
@@ -153,6 +153,7 @@ system properties will be used to specify the upstream proxy.
 
 ### Embedded Mode
 
+**New in 2.1:** New Embedded Mode module
 
 BrowserUp Proxy separates the Embedded Mode and REST API into two modules. If you only need Embedded Mode functionality, add the `BrowserUp-core` artifact as a dependency. The REST API artifact is `BrowserUp-rest`.
 

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ system properties will be used to specify the upstream proxy.`
`153`	`153`
`154`	`154`	`### Embedded Mode`
`155`	`155`
	`156`	`+New in 2.1: New Embedded Mode module`
`156`	`157`
`157`	`158`	BrowserUp Proxy separates the Embedded Mode and REST API into two modules. If you only need Embedded Mode functionality, add the `BrowserUp-core` artifact as a dependency. The REST API artifact is `BrowserUp-rest`.
`158`	`159`