Commit 8da1e3ad authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.1.x' into 2.2.x

parents bfe1c281 6a9450ee
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -61,7 +61,7 @@ public abstract class AbstractViewResolverProperties { ...@@ -61,7 +61,7 @@ public abstract class AbstractViewResolverProperties {
private Charset charset = DEFAULT_CHARSET; private Charset charset = DEFAULT_CHARSET;
/** /**
* The view names that can be resolved. * View names that can be resolved.
*/ */
private String[] viewNames; private String[] viewNames;
......
Markdown is supported
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