changeset 1671:c1e50875a6a3

Merge branch 'master' into new_master
author Robert Casties <r0bcas7@gmail.com>
date Thu, 23 Nov 2017 19:46:40 +0100
parents 0a8070be7900 (current diff) 0268cfc402fa (diff)
children 7f06a88745c4
files .hgtags common-bioformats/pom.xml common-imagej/pom.xml common-jai/pom.xml common/pom.xml common/src/main/java/digilib/conf/DigilibConfiguration.java doc/pom.xml iiif-presentation/pom.xml pdf/pom.xml pom.xml servlet/pom.xml servlet2/pom.xml servlet3/pom.xml text/pom.xml webapp/pom.xml webapp/src/main/webapp/jquery/jquery.digilib.js
diffstat 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff