Merge branch 'update' into 'develop' (a34b92b1) · Commits · Strand Lab / StrandLab2.net · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

StrandLab2.net
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Strand Lab
StrandLab2.net
Commits
a34b92b1

Commit a34b92b1 authored 5 years ago by

Gervaise Henry

Downloads
- Plain Diff

Merge branch 'update' into 'develop'

Update

See merge request !1

parents cf5cfb72 6be9589a

3 merge requests!9Develop,!4Develop,!1Update

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

archetypes/people.md 2 additions, 0 deletions

archetypes/people.md
content/data.md 4 additions, 3 deletions

content/data.md
content/people/henry_g.md 3 additions, 1 deletion

content/people/henry_g.md
content/people/joseph_d.md 2 additions, 0 deletions

content/people/joseph_d.md
content/people/malewska_a.md 2 additions, 0 deletions

content/people/malewska_a.md
content/people/mcalanis_c.md 3 additions, 1 deletion

content/people/mcalanis_c.md
content/people/strand_d.md 2 additions, 0 deletions

content/people/strand_d.md
content/repository.md 8 additions, 8 deletions

content/repository.md
content/research.md 1 addition, 1 deletion

content/research.md
layouts/custom/data.html 1 addition, 0 deletions

layouts/custom/data.html
layouts/custom/people.html 27 additions, 2 deletions

layouts/custom/people.html
layouts/custom/publications.html 1 addition, 0 deletions

layouts/custom/publications.html

with 56 additions and 16 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment