Commit Graph

13 Commits

Author SHA1 Message Date
dantanxiaotian 7060f2e7e3 Merge branch 'master' of https://github.com/atusa17/ptp into PAN-15
# Conflicts:
#	src/main/java/edu/msudenver/tsp/website/Application.java
2019-03-24 15:00:20 -06:00
dantanxiaotian 89f1c55f51 PAN-15 Fixed unit tests 2019-03-24 14:54:06 -06:00
Dark-Alex-17 296cf62be6 PAN-52 Fixed issue with the Theorems API 2019-03-21 11:40:19 -06:00
Dark-Alex-17 8c79d9975e Merge branches 'PAN-16' and 'master' of https://github.com/atusa17/ptp into PAN-16
# Conflicts:
#	services/build.gradle
2019-03-20 22:32:25 -06:00
Dark-Alex-17 749a20c0fd Merge branches 'PAN-16' and 'master' of https://github.com/atusa17/ptp into PAN-16
# Conflicts:
#	services/build.gradle
2019-03-20 22:00:11 -06:00
- 5479130178 fixed again, thanks Alex for your detailed reviews I have learned alot :) 2019-03-19 17:44:53 -06:00
- f0cb7633c6 updated with passed tests 2019-03-19 00:11:38 -06:00
- 9f5d9e24f5 made few changes also adding test method 2019-03-18 13:52:01 -06:00
- 0afe995950 Reverted build file changes 2019-03-15 01:44:51 -06:00
- c45c0a6108 add to PAN-16 2019-03-14 17:04:10 -06:00
- 139dc943c3 PAN-16 finished 2019-03-14 16:58:17 -06:00
Alex Tusa 27e56039f4 Create README.md 2019-03-04 18:15:22 -07:00
Dark-Alex-17 96c90a3c49 change git root 2019-03-03 16:13:24 -07:00