merge with branch 1.x

This commit is contained in:
Sebastian Sdorra
2017-01-12 19:50:39 +01:00
250 changed files with 16399 additions and 1573 deletions

View File

@@ -184,8 +184,8 @@ public class ErrorServlet extends HttpServlet
//~--- fields ---------------------------------------------------------------
/** Field description */
private SCMContextProvider context;
private final SCMContextProvider context;
/** Field description */
private TemplateEngineFactory templateEngineFactory;
private final TemplateEngineFactory templateEngineFactory;
}