Merge branch 'email'

Conflicts: config.ru
schacon · Dec 6, 2010 · b2f60e2 · b2f60e2
2 parents 1234232 + d1e5d37
commit b2f60e2
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/config.ru b/config.ru
@@ -2,3 +2,4 @@
 
 require ::File.expand_path('../config/environment',  __FILE__)
 run App::MyApp
+run App::Application