Merge branch 'feature-newstyles' into develop
authorOlga Brani <olgabrani@grnet.gr>
Tue, 18 Jun 2013 14:30:28 +0000 (17:30 +0300)
committerOlga Brani <olgabrani@grnet.gr>
Tue, 18 Jun 2013 14:30:28 +0000 (17:30 +0300)
commit27d134b17f5c72f4573466a37316fec299217f1b
tree98a76ca89d00165f54c0da8f6c078a9c99791c62
parent40156b095087c4bb0d3be8127f973211a9750834
parentff30ee3a6bc7387d159c088a3b7d4194f23ade83
Merge branch 'feature-newstyles' into develop

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