Skip to content
Snippets Groups Projects
Commit 26ae5d59 authored by vulcain's avatar vulcain
Browse files

Merge branch 'newinfra' into 'nano' 

# Conflicts:
#   roles/root-config/templates/nanorc.j2
parents 2cf9fe07 45a84cf9
No related branches found
No related tags found
2 merge requests!64Keepalived,!32patch source of python.nanorc
Hide whitespace changes
Inline Side-by-side
Showing
with 255 additions and 416 deletions
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