projects
/
snf-image-creator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into develop
[snf-image-creator]
/
image_creator
/
version.py
diff --git
a/image_creator/version.py
b/image_creator/version.py
index
9991964
..
2026ff2
100644
(file)
--- a/
image_creator/version.py
+++ b/
image_creator/version.py
@@
-1,8
+1,8
@@
-
-__version__ = "0.4.2next"
+__version__ = "0.4.3"
__version_vcs_info__ = {
__version_vcs_info__ = {
- 'branch': 'develop',
- 'revid': '9d48081',
- 'revno': 325}
+ 'branch': 'master',
+ 'revid': '9f0e45e',
+ 'revno': 319}
+>>>>>>> master
__version_user_email__ = "skalkoto@grnet.gr"
__version_user_name__ = "Nikos Skalkotos"
__version_user_email__ = "skalkoto@grnet.gr"
__version_user_name__ = "Nikos Skalkotos"