diff servlet2/LICENSE.txt @ 1660:75a74f7045b4

Merge branch 'master' into release-2.5 Conflicts: common/src/main/java/digilib/conf/DigilibConfiguration.java
author Robert Casties <r0bcas7@gmail.com>
date Tue, 21 Nov 2017 15:18:31 +0100
parents cd8cea9d8c03
children
line wrap: on
line diff