projects / snf-cloudcms / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6a584a 46c1f9c)
Merge branch 'newstyles' of https://code.grnet.gr/git/snf-cloudcms into newstyles
authorOlga Brani <olgabrani@grnet.gr>
Thu, 10 Jan 2013 10:47:27 +0000 (12:47 +0200)
committerOlga Brani <olgabrani@grnet.gr>
Thu, 10 Jan 2013 10:47:27 +0000 (12:47 +0200)
Conflicts:
cloudcms/static/cloudcms/css/forms.css
cloudcms/static/cloudcms/css/modules.css
cloudcms/static/cloudcms/js/common.js
cloudcms/templates/cms/base.html


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