projects
/
pithos-web-client
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
4e9db87
)
Merge branch 'master' into develop
author
Kostas Papadimitriou
<kpap@grnet.gr>
Thu, 21 Nov 2013 16:36:07 +0000
(18:36 +0200)
committer
Kostas Papadimitriou
<kpap@grnet.gr>
Thu, 21 Nov 2013 16:36:07 +0000
(18:36 +0200)
Conflicts:
version
version
patch
|
blob
|
history
diff --git
a/version
b/version
index
a798d12
..
f6e9360
100644
(file)
--- a/
version
+++ b/
version
@@
-1
+1
@@
-0.14.5next
+0.14.9next