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

6b81adfd

Commit 6b81adfd authored 11 years ago by Nikos Skalkotos

Downloads
- Plain Diff

Merge branch 'hotfix-0.5.2' into develop

Conflicts:
	image_creator/version.py
	version

parents 694ca1e9 f97dbc42

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 3 additions, 0 deletions

ChangeLog
ci/autopkg_debian.sh 1 addition, 1 deletion

ci/autopkg_debian.sh
ci/pylint.sh 1 addition, 1 deletion

ci/pylint.sh
docs/conf.py 2 additions, 2 deletions

docs/conf.py
image_creator/version.py 6 additions, 5 deletions

image_creator/version.py
version 1 addition, 1 deletion

version

with 14 additions and 10 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