|
|
748781f10f
|
Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15
# Conflicts:
# build.gradle
# persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java
# persistence/src/test/java/edu/msudenver/tsp/persistence/controller/AccountControllerTest.java
# services/src/main/java/edu/msudenver/tsp/services/RestService.java
# services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
# services/src/main/java/edu/msudenver/tsp/services/factory/RequestFactory.java
# services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java
# services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java
|
2019-03-20 22:15:32 -06:00 |
|
|
|
6197beb309
|
PAN-52 Updated the build.gradle files
|
2019-03-17 15:37:04 -06:00 |
|
dantanxiaotian
|
ffaf020b80
|
PAN-15 WORKING AND WITH TRAVIS!!!
|
2019-03-10 17:21:32 -06:00 |
|
dantanxiaotian
|
5d429b2c8e
|
PAN-15 Updated tests
|
2019-03-10 17:06:47 -06:00 |
|
dantanxiaotian
|
10b0a09690
|
PAN-15 Updated the gradle dependencies
|
2019-03-10 16:18:19 -06:00 |
|
|
|
e9661fdf78
|
PAN-60 created initial RestService
|
2019-03-10 11:48:34 -06:00 |
|
|
|
96c90a3c49
|
change git root
|
2019-03-03 16:13:24 -07:00 |
|