annotate app/views/activities/.svn/prop-base/index.html.erb.svn-base @ 726:386fcfd7459f feature_14

Merge from branch "luisf"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 24 Oct 2011 15:28:29 +0100
parents 40f7cfd4df19
children
rev   line source
chris@22 1 K 13
chris@22 2 svn:eol-style
chris@22 3 V 6
chris@22 4 native
chris@22 5 END