Cms new content type (color box)
Merge branch 'faqs' into newstyles
Fix page migration order
Merge branch 'clientsdownloads' into newstyles
Conflicts: cloudcms/content.py
Integrate automatic discovery of client versions
Remove duplicate migration
New styles
Merge branch 'master' into newfeatures
Empty template, and intro "button" content type
Resources application initial commit
View revisions
Also available in: Atom