projects
/
pithos-web-client
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
4e9db87
5e71099
)
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
1
2
version
patch
|
diff1
|
diff2
|
blob
|
history
diff --combined
version
index
a798d12
,
815b3a9
..
f6e9360
---
1
/
version
---
2
/
version
+++ b/
version
@@@
-1,1
-1,1
+1,1
@@@
- 0.14.5next
-0.14.9
++0.14.9next