Skip to content
Snippets Groups Projects
Commit 63c122d4 authored by Uwe Jandt (DESY, HIFIS)'s avatar Uwe Jandt (DESY, HIFIS)
Browse files

Merge branch 'master' into 'more-publications'

# Conflicts:
#   mission/publications.md
parents eb4eb8d4 a7d2f230
No related branches found
No related tags found
1 merge request!159More publications
......@@ -10,6 +10,6 @@ gem 'jekyll-feed', '~> 0.15.1'
gem "jekyll-sitemap", "~> 1.4"
group :test do
gem 'html-proofer', '~> 3.18.5'
gem 'html-proofer', '~> 3.18.6'
gem 'yaml-lint', '~>0.0.7'
end
......@@ -13,7 +13,7 @@ GEM
eventmachine (1.2.7)
ffi (1.14.2)
forwardable-extended (2.6.0)
html-proofer (3.18.5)
html-proofer (3.18.6)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogumbo (~> 2.0)
......@@ -59,15 +59,17 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.4.0)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
mini_portile2 (2.5.0)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (2.0.4)
nokogiri (~> 1.8, >= 1.8.4)
parallel (1.20.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.6)
racc (1.5.2)
rainbow (3.0.0)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
......@@ -89,7 +91,7 @@ PLATFORMS
ruby
DEPENDENCIES
html-proofer (~> 3.18.5)
html-proofer (~> 3.18.6)
jekyll (~> 4.2.0)
jekyll-feed (~> 0.15.1)
jekyll-paginate (~> 1.1.0)
......
......@@ -89,7 +89,7 @@ Most of the documentation is planned to be made publicly available by Q4, 2020.
#### Reports
* [Annual report for the year 2019](https://nubes.helmholtz-berlin.de/f/78483551)
* [Feedback Report auf the Scientific Advisory Board, May 2020](https://nubes.helmholtz-berlin.de/f/84005457)
* [Feedback Report of the Scientific Advisory Board, May 2020](https://nubes.helmholtz-berlin.de/f/84005457)
# Internal Organization
* [HIFIS Stakeholder List](https://nubes.helmholtz-berlin.de/f/41769740)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment