projects / pithos-web-client / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e9db87 5e71099)
Merge branch 'master' into develop
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 21 Nov 2013 16:36:07 +0000 (18:36 +0200)
committerKostas 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 --cc 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
Unnamed repository; edit this file 'description' to name the repository.