fixed merge version conflict
Description
Description
Details
Details
- Committed
Ty <Ty_Coghlan@hms.harvard.edu> Nov 21 2016, 21:12 - Pushed
mickmis Mar 14 2017, 15:12 - Parents
- R2664:47e302dab01c: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
R2664:a49af481c0df: front end fixes for Dashboard - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| a49af481c0df | Ty | front end fixes for Dashboard | Nov 21 2016 | |||
| 5ecc1bbfaef6 | Ty | frontend fixes | Nov 21 2016 | |||
| 00b9c7de3476 | Ty | got rid of weird base case check on remoteSiteStatuses for keystore panel | Nov 18 2016 | |||
| 1c7dbab5e3a5 | Ty | Merge branch 'release/1.22.2' of https://open.med.harvard. | Nov 18 2016 | |||
| 1427c683442e | Ty | Config File => Config | Nov 18 2016 | |||
| 762f0179b159 | ben-carmen | fix for SHRINE-1762 | Nov 18 2016 | |||
| 0ee9a72d63f5 | ben-carmen | Merge branch 'release/1.22.2' of https://open.med.harvard. | Nov 18 2016 | |||
| 63198c668de0 | ben-carmen | fix for SHRINE-1782 | Nov 18 2016 | |||
| a5d3d3de237b | Ty | resolved pom merge conflict | Nov 18 2016 | |||
| 0e6751c376de | Ty | version upgraded to 1.22.2.1-SNAPSHOT | Nov 18 2016 | |||
| 2e29258d0e7d | Ty | version fix on dashboard | Nov 18 2016 | |||
| c8874207fb75 | Catalyst Bamboo | Update POMs with release version 1.22.2.0. | Nov 17 2016 | |||
| ce1676bf894f | Ty | updated version to 1.22.2.0-SNAPSHOT | Nov 17 2016 |