1. 25 Sep, 2019 1 commit
    • hengwen's avatar
      Merge branch 'remove-sfx' into ChargingStation · 78e405fc
      hengwen authored
      # Conflicts:
      #	.gitlab-ci.yml
      #	docker/World.zone.xml
      #	license/se/license.txt
      #	restful/README.md
      #	restful/TestDockerfile
      #	restful/pom.xml
      #	restful/src/main/java/server/restful/service/SimulatorService.java
      #	restful/src/main/java/server/restful/service/VehicleService.java
      #	restful/src/test/java/server/restful/service/MapServiceTest.java
      #	restful/src/test/java/server/restful/service/NavigationServiceTest.java
      #	restful/src/test/java/server/restful/service/VehicleServiceTest.java
      #	restful/src/test/java/server/restful/service/WorldBuilderServiceTest.java
      #	rpc/README.md
      #	rpc/pom.xml
      #	rpc/src/main/java/server/rpc/SimulationControllerImpl.java
      #	rpc/src/main/java/server/rpc/SimulationObserver.java
      #	rpc/src/main/proto/simulationController.proto
      78e405fc
  2. 24 Sep, 2019 1 commit
  3. 17 Sep, 2019 1 commit
  4. 03 Jun, 2019 1 commit
  5. 22 May, 2019 1 commit
  6. 09 Apr, 2019 1 commit
  7. 10 Jan, 2019 1 commit
  8. 07 Dec, 2018 1 commit
  9. 03 Nov, 2017 1 commit