Merge branch 'hotfix-0.4.4' into develop (6f391961) · 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

6f391961

Commit 6f391961 authored 11 years ago by Nikos Skalkotos

Downloads
- Plain Diff

Merge branch 'hotfix-0.4.4' into develop

Conflicts:
	image_creator/os_type/unix.py
	image_creator/version.py
	version

parents c5effe03 3784c7c1

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 4 additions, 0 deletions

ChangeLog
docs/conf.py 2 additions, 2 deletions

docs/conf.py
image_creator/os_type/__init__.py 7 additions, 0 deletions

image_creator/os_type/__init__.py
image_creator/os_type/unix.py 8 additions, 2 deletions

image_creator/os_type/unix.py
image_creator/version.py 3 additions, 3 deletions

image_creator/version.py
version 1 addition, 1 deletion

version

with 25 additions and 8 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