Mercurial > hg > digilib
comparison common-imagej/pom.xml @ 1669:078bf3d13f5c
Merge branch 'master' into release-2.5
Conflicts:
common/src/main/java/digilib/conf/DigilibConfiguration.java
webapp/src/main/webapp/jquery/jquery.digilib.js
| author | Robert Casties <r0bcas7@gmail.com> |
|---|---|
| date | Thu, 23 Nov 2017 18:41:50 +0100 |
| parents | cf9dcddf4ec6 |
| children | 0268cfc402fa |
comparison
equal
deleted
inserted
replaced
| 1661:cf9dcddf4ec6 | 1669:078bf3d13f5c |
|---|