diff .svn/pristine/1e/1ef1c1b3db8e0ec86373a9f847e88d0b2afb5d10.svn-base @ 926:b73a59a6acbd luisf

Merge from cannam_integration
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 11 May 2012 16:10:11 +0100
parents cbb26bc654de
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/1e/1ef1c1b3db8e0ec86373a9f847e88d0b2afb5d10.svn-base	Fri May 11 16:10:11 2012 +0100
@@ -0,0 +1,2 @@
+class AssetsController < ApplicationController
+end
\ No newline at end of file