projects
/
snf-cloudcms
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
aee74b6
)
Merge branch 'hotfix-0.14.1' into develop
author
Kostas Papadimitriou
<kpap@grnet.gr>
Wed, 3 Jul 2013 07:52:44 +0000
(10:52 +0300)
committer
Kostas Papadimitriou
<kpap@grnet.gr>
Wed, 3 Jul 2013 07:52:44 +0000
(10:52 +0300)
Conflicts:
version
version
patch
|
blob
|
history
diff --git
a/version
b/version
index
948a547
..
e81d965
100644
(file)
--- a/
version
+++ b/
version
@@
-1
+1
@@
-0.14
+0.14next