Split out asset fetches into a separate controller
Move responsibility for finding layouts to the Site
undefined method `edit_cms_site_layout_path' fix error

undefined method `edit_cms_site_layout_path' 
route path was changed to edit_admin_cms_site_layout_path
Merge pull request #384 from mixan946/patch-1

undefined method `edit_cms_site_layout_path' fix error
a test
rich_text is the default for new layouts
not monkeypatching logger anymore
i8n-ised "Add Category" placeholder in Categories/_index. Added translations for all locales"
Merge pull request #385 from steverob/i8n-add-categories-372

Internationaized 'Add Category' field placeholder in 'categories/_index'
Refactor content controller to accept respond_to blocks
Merge branch 'refactor_content_controller' of git://github.com/modsognir/comfortable-mexican-sofa into modsognir-refactor_content_controller
a bit of cleanup
Merge branch 'master' of github.com:comfy/comfortable-mexican-sofa
adding rails 4.1 to travis
adjusting version
changing how distinct is handled
getting things working again
getting things working again
fixing css
Bump to 1.11.1