Merge branch 'master' into '12-repartition-root-disk-when-adding-encryption' (9489fe86) · Commits · Greenhost / cryptops · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

cryptops
- Activity
- Members
- Labels
- Issues
  5
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

Due to spam, we had to disable registrations and GitHub login. Please reach out to us at support@greenhost.net if you want to contribute.

9489fe86

Commit 9489fe86 authored 7 years ago by Maarten de Waard

Downloads
- Plain Diff

Merge branch 'master' into '12-repartition-root-disk-when-adding-encryption'

# Conflicts:
#   src/includes/settings.h

parents 67e416e9 fa8b8241

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/api/ssh_keys_get.c 82 additions, 0 deletions

src/api/ssh_keys_get.c
src/cryptops-api.c 3 additions, 0 deletions

src/cryptops-api.c
src/includes/settings.h 1 addition, 1 deletion

src/includes/settings.h

with 86 additions and 1 deletion

Loading

0% Loading 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