Skip to content
Commit 43e7693e authored by Carl Harris's avatar Carl Harris
Browse files

Merge remote-tracking branch 'origin/LOGBACK-848' into LOGBACK-848 

Conflicts:
	logback-core/src/main/java/ch/qos/logback/core/ContextBase.java
parents 735d1271 1911c7fb
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment