j2blake 6a17e836eb Merge branch 'maint-rel-1.6' into develop ... Conflicts: utilities/ISF-transition/obsoleteUris/event.rb utilities/ISF-transition/obsoleteUris/known_exceptions.rb utilities/ISF-transition/obsoleteUris/report.rb		2013-10-23 16:14:41 -04:00
..
acceptance-tests	RC1 test case changes by Holly	2013-10-22 17:04:06 -04:00
ISF-transition/obsoleteUris	Polish the obsolete_URI script.	2013-10-23 16:03:45 -04:00
languageSupport	VIVO-347 "Spanish" display names for PropertyConfig.n3	2013-10-15 15:45:25 -04:00
LoadTesting	Update the LoadTesting framework.	2013-10-22 15:43:05 -04:00
pre-compileJSPs	VIVO-2 Modify the build so installers can create a container-neutral VIVO.	2013-01-16 14:52:35 -05:00
releaseScripts	Adjust the release script to an older Git client	2013-10-18 15:04:43 -04:00
xslt	NIHVIVO-46 Add license tags to these files.	2010-03-24 20:27:53 +00:00