projects / pithos-web-client / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0fbbd4e ea1faa0)
Merge branch 'develop' into release-0.16
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 9 Sep 2014 12:41:20 +0000 (15:41 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 9 Sep 2014 12:41:20 +0000 (15:41 +0300)
Conflicts:
version


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.