Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6

2013-12-04 15:27:19 -05:00 · 2013-12-04 15:27:19 -05:00 · 00e8c93ce3
commit 00e8c93ce3
parent 3978f30413 f56d87d7f6
4 changed files with 1 additions and 1 deletions
--- a/doc/3rd-party-licenses.txt
+++ b/doc/3rd-party-licenses.txt
@ -23,10 +23,10 @@ csv
 dwr
 ezmorph
 gson
 jakarta-jstl
 jackson-annotations-2.3.0
 jackson-core-2.3.0
 jackson-databind-2.3.0
 jakarta-jstl
 jarjar
 jmeter
 joda-time
--- a/lib/jackson-annotations-2.3.0.jar
+++ b/lib/jackson-annotations-2.3.0.jar
--- a/lib/jackson-core-2.3.0.jar
+++ b/lib/jackson-core-2.3.0.jar
--- a/lib/jackson-databind-2.3.0.jar
+++ b/lib/jackson-databind-2.3.0.jar