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)
commitaaae4ef41ae1bfbf3f49d0e057063ba27462abd3
tree4e3d4d6d3912fbc902bd21f75f097a3794053013
parentb6a584a8043c2d0cd99d8031e7e96b15982f945f
parent46c1f9cd5791d36ab7d91644d0af0933e82bb299
Merge branch 'newstyles' of https://code.grnet.gr/git/snf-cloudcms into newstyles

Conflicts:
cloudcms/static/cloudcms/css/forms.css
cloudcms/static/cloudcms/css/modules.css
cloudcms/static/cloudcms/js/common.js
cloudcms/templates/cms/base.html