# HG changeset patch # User Robert Casties # Date 1511462800 -3600 # Node ID c1e50875a6a38e937e75f4b3b358768dd3073f40 # Parent 0a8070be7900551fdafe18cda6858c5b8e020f73# Parent 0268cfc402fa887d23de8b1f723a46fb037380ba Merge branch 'master' into new_master diff -r 0a8070be7900 -r c1e50875a6a3 .hgtags diff -r 0a8070be7900 -r c1e50875a6a3 common-bioformats/pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 common-imagej/pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 common-jai/pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 common/pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 common/src/main/java/digilib/conf/DigilibConfiguration.java diff -r 0a8070be7900 -r c1e50875a6a3 doc/pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 iiif-presentation/pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 pdf/pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 servlet/pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 servlet2/pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 servlet3/pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 text/pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 webapp/pom.xml diff -r 0a8070be7900 -r c1e50875a6a3 webapp/src/main/webapp/jquery/jquery.digilib.js