Changeset [2a1754d55492de1847021f80a2d6b00002c0acc1] by Brian Michalski
Revision 2a1754d55492de1847021f80a2d6b00002c0acc1,
committed by Brian Michalski
· December 18th, 2011 @ 02:12 AM
Merge branch 'master' of github.com:concerto/concerto
https://github.com/concerto/concerto/commit/2a1754d55492de1847021f8...
11 changed files
-
A
app/assets/stylesheets/application/layout/type.scss.erb -
M
app/assets/stylesheets/application/common/reset.scss.erb -
M
app/assets/stylesheets/application/index-manifest.scss -
M
app/assets/stylesheets/application/layout/contentcell.scss.erb -
M
app/assets/stylesheets/application/layout/gridlist.scss.erb -
M
app/controllers/contents_controller.rb -
M
app/controllers/submissions_controller.rb -
M
app/views/contents/index.html.erb -
M
app/views/layouts/application.html.erb -
M
app/views/submissions/index.html.erb -
M
app/views/subscriptions/show.html.erb