-
Conflicts: crophub_oauth_client/src/main/java/org/crophub/auth/client/CropHubClient.java crophub_server_oauth/src/main/java/org/crophub/auth/server/utils/ServiceEndpoints.java crophub_server_oauth/src/main/resources/spring/auth-servlet.xml crophub_server_oauth/src/main/resources/spring/spring-security.xml
1366e2c0