Merge branch 'develop' of github.com:j2blake/Vitro into develop

Browse source

* 'develop' of github.com:j2blake/Vitro:
  VIVO-1246 The documentation was in the wrong place.
  VIVO-1246 Move unit tests to the new location.
  VIVO-1247, remove duplicate code used with ConfigurationBeanLoader.
  VIVO-1246 improve the ConfigurationBeanLoader:

# Conflicts:
#	api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/PropertyType.java
#	api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
#	api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTestBase.java
#	api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader_Cardinality_Test.java
#	api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader_PropertyTest.java

...

This commit is contained in:

Jim Blake 2017-03-12 20:33:12 -04:00

parent 1bc1f68548 41ff46e771

commit 472cc3a1a9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available