Skip to content
Snippets Groups Projects
Commit a49f655c authored by Andreas Hamacher's avatar Andreas Hamacher
Browse files

Merge remote-tracking branch 'origin/master' into slurmtestfix

parents 6ad362de cf7174c8
No related branches found
No related tags found
2 merge requests!326Slurmtestfix,!313Mockldap without TLS enabled but capable
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
README.md
+ 2
− 1
View file @ a49f655c
...@@ -70,10 +70,11 @@ Configuration is defined in the variables (vars) in the vars folder. See CICD/va ...@@ -70,10 +70,11 @@ Configuration is defined in the variables (vars) in the vars folder. See CICD/va
- Contribution guidelines would also be a good contribution :) - Contribution guidelines would also be a good contribution :)
<a name="partners"></a> <a name="partners"></a>
## Used by: TODO the usage of the partner banners is yet to be allowed and confirmed by thee partners ## Used by:
![Monash University](docs/images/monash-university-logo.png "monash.edu") ![Monash University](docs/images/monash-university-logo.png "monash.edu")
![MASSIVE](docs/images/massive-website-banner.png "massive.org.au") ![MASSIVE](docs/images/massive-website-banner.png "massive.org.au")
![Australian Research Data Commons](docs/images/ardc.png "ardc.edu.au") ![Australian Research Data Commons](docs/images/ardc.png "ardc.edu.au")
![University of Western Australia](docs/images/university-of-western-australia-logo.png "uwa.edu.au")
<a name="Coverage"></a> <a name="Coverage"></a>
## CI Coverage ## CI Coverage
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment