Mercurial > hg > digilib
comparison iiif-presentation/pom.xml @ 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 | 392a149ed4d6 22dd14eccdc0 |
children | cf9dcddf4ec6 |
comparison
equal
deleted
inserted
replaced
1638:dc440131299b | 1660:75a74f7045b4 |
---|---|
9 <version>2.5.3</version> | 9 <version>2.5.3</version> |
10 </parent> | 10 </parent> |
11 <artifactId>digilib-iiif-presentation</artifactId> | 11 <artifactId>digilib-iiif-presentation</artifactId> |
12 <name>digilib-iiif-presentation</name> | 12 <name>digilib-iiif-presentation</name> |
13 <description>The Digital Image Library - IIIF presentation API manifest serving servlet</description> | 13 <description>The Digital Image Library - IIIF presentation API manifest serving servlet</description> |
14 <url>http://digilib.sourceforge.net</url> | 14 <url>https://github.com/robcast/digilib</url> |
15 <properties> | 15 <properties> |
16 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | 16 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
17 </properties> | 17 </properties> |
18 <dependencies> | 18 <dependencies> |
19 <dependency> | 19 <dependency> |