Merge branch 'master' into develop (2640d4e6) · Commits · itminedu / snf-image-creator · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

snf-image-creator
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

2640d4e6

Commit 2640d4e6 authored 8 years ago by Nikos Skalkotos

Downloads
- Plain Diff

Merge branch 'master' into develop

Conflicts:
	image_creator/version.py
	version

parents 2bf33bd0 35fc643e

Branches develop

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 3 additions, 0 deletions

ChangeLog
image_creator/dialog_menu.py 2 additions, 2 deletions

image_creator/dialog_menu.py
image_creator/dialog_wizard.py 5 additions, 4 deletions

image_creator/dialog_wizard.py
image_creator/main.py 5 additions, 4 deletions

image_creator/main.py
image_creator/os_type/linux.py 4 additions, 1 deletion

image_creator/os_type/linux.py

with 19 additions and 11 deletions

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