annotate .svn/pristine/17/17e6519b50da04ce88ce18f460d2215c425cc034.svn-base @ 1426:7367cd232b1e luisf

Merge.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 07 Oct 2013 15:42:39 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 <div id="assets_layout">
Chris@909 2 <%= yield %>
Chris@909 3 </div>