gemfile
Merge branch 'master' of https://github.com/sh0w/poodle into update_routes
:q
q
Merge branch 'master' of https://github.com/sh0w/poodle into update_routes
resource polymorphic association (resource->attachment)
merge conflicts
fixed links & rendered partials for polymorphic associations (resource/attachments of different types)
ui bugfixes