Skip to content
Commit bb6c0ea5 authored by Ceki Gulcu's avatar Ceki Gulcu
Browse files

Merge remote-tracking branch 'abatkin/access_pattern_conversions' into...

Merge remote-tracking branch 'abatkin/access_pattern_conversions' into abatkin-access_pattern_conversions

Conflicts (resolved):
	logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java
	logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java
	logback-access/src/main/java/ch/qos/logback/access/spi/IAccessEvent.java
	logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java
parents df372086 fa4e878d
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