diff options
author | Edoardo Pasca <edo.paskino@gmail.com> | 2019-03-19 13:34:31 +0000 |
---|---|---|
committer | Edoardo Pasca <edo.paskino@gmail.com> | 2019-03-19 13:34:31 +0000 |
commit | 6c6c8474bd869467e7f381c21cef195fc7250045 (patch) | |
tree | 6061a135ff87314f554ac187c4b5d0e053d6a964 /README.md | |
parent | 174d0ace64decac39340c7b160ffdaf37676a6d2 (diff) | |
parent | 99bd0d80ab7bb445b6c50fd32ab55508da5297e7 (diff) | |
download | framework-6c6c8474bd869467e7f381c21cef195fc7250045.tar.gz framework-6c6c8474bd869467e7f381c21cef195fc7250045.tar.bz2 framework-6c6c8474bd869467e7f381c21cef195fc7250045.tar.xz framework-6c6c8474bd869467e7f381c21cef195fc7250045.zip |
Merge remote-tracking branch 'origin/master' into composite_operator_datacontainer
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,7 +1,7 @@ -| master build | pull request build | -|--------|-------------| -| [![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Framework/) | [![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework-dev)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Framework-dev/) | +| Master | Development | Anaconda binaries | +|--------|-------------|-------------------| +| [![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Framework/) | [![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework-dev)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Framework-dev/) |![conda version](https://anaconda.org/ccpi/ccpi-framework/badges/version.svg) ![conda last release](https://anaconda.org/ccpi/ccpi-framework/badges/latest_release_date.svg) [![conda platforms](https://anaconda.org/ccpi/ccpi-framework/badges/platforms.svg) ![conda dowloads](https://anaconda.org/ccpi/ccpi-framework/badges/downloads.svg)](https://anaconda.org/ccpi/ccpi-framework) | # CCPi-Framework |