Merge branch 'master' of github.com:concerto/concerto

concerto · Jun 1, 2012 · cb3e0f1 · cb3e0f1
2 parents 1f4bb39 + 63e774d
commit cb3e0f1
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 0 deletions.
diff --git a/Rakefile b/Rakefile
diff --git a/db/seed_assets/BlueSwooshNeo_16x9.jpg b/db/seed_assets/BlueSwooshNeo_16x9.jpg
diff --git a/test/fixtures/files/simple_template.xml b/test/fixtures/files/simple_template.xml