Changeset [306f8f9e2edb4f95fdf9d4aa05f2d21cefae7c87] by Brian R Zaik
Revision 306f8f9e2edb4f95fdf9d4aa05f2d21cefae7c87,
committed by Brian R Zaik
· July 6th, 2012 @ 06:17 PM
Merge branch 'master' of github.com:concerto/concerto into
revised_info_arch
https://github.com/concerto/concerto/commit/306f8f9e2edb4f95fdf9d4a...
10 changed files
-
A
app/assets/stylesheets/application/layout/navs.scss.erb -
R
app/assets/stylesheets/application/layout/modalselector.scss.erb -
R
app/assets/stylesheets/application/layout/navigation.scss.erb -
M
app/assets/stylesheets/application/common/mixins.scss.erb -
M
app/assets/stylesheets/application/common/variables.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/scaffolding.scss.erb -
M
app/views/contents/new.html.erb -
M
app/views/submissions/_index_body.html.erb