108b3d832b
# Conflicts: # assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java # dockerfiles/init/manifests/che.env # plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/MachineProviderImplTest.java # plugins/plugin-docker/pom.xml # plugins/plugin-github/che-plugin-github-pullrequest/src/main/java/org/eclipse/che/plugin/pullrequest/client/GitHubHostingService.java # pom.xml # wsagent/agent/src/main/java/org/eclipse/che/api/agent/WsAgentLauncher.java # wsagent/agent/src/test/java/org/eclipse/che/api/agent/WsAgentLauncherTest.java # wsmaster/che-core-api-machine/pom.xml # wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java |
||
|---|---|---|
| .. | ||
| che-core-api-core | ||
| che-core-api-dto | ||
| che-core-api-dto-maven-plugin | ||
| che-core-api-model | ||
| che-core-db | ||
| che-core-db-vendor-h2 | ||
| che-core-db-vendor-postgresql | ||
| che-core-typescript-dto-maven-plugin | ||
| commons | ||
| pom.xml | ||