Changeset [27840cc3f847c7a9b73ac327fc446323f962c364] by Ceeram
Revision 27840cc3f847c7a9b73ac327fc446323f962c364,
committed by Ceeram
· January 8th, 2010 @ 11:32 AM
fixed merge conflict
http://github.com/infinitas/infinitas/commit/27840cc3f847c7a9b73ac3...
2 changed files
-
A
views/themed/aqueous/layouts/two_columns.ctp -
A
views/themed/aqueous/webroot/css/one.css