projects / snf-cloudcms / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c504306 a883c36)
Merge branch 'release-0.15'
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 1 Apr 2014 10:05:03 +0000 (13:05 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 1 Apr 2014 10:05:03 +0000 (13:05 +0300)
Conflicts:
cloudcms/static/cloudcms/js/common.js
cloudcms/synnefo_settings.py
version


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