annotate .svn/pristine/92/923ece2f09d9d50ac81cc9fdbc2753d0df52cd4c.svn-base @ 1386:e4c393cebb1a luisf

Merger from testing branch.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Tue, 24 Sep 2013 16:25:05 +0100
parents 038ba2d95de8
children
rev   line source
Chris@1296 1 <div id="admin-menu">
Chris@1296 2 <%= render_menu :admin_menu %>
Chris@1296 3 </div>