aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-04-02 17:45:54 +0100
committerRobin Houston <robin.houston@gmail.com>2012-04-02 17:45:54 +0100
commit3a18daf0b880ad9f7ee3591c3c777edfd5688b34 (patch)
treed78d06a2a1ba4c1f3ad72119e54d71886d519652
parent950e8ed8e0e611ed2a652dac78537b5eda12bfe7 (diff)
parent5d2c5f7145f59afe5f77937fe4a6ea596b9c34e3 (diff)
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
-rw-r--r--config.ru2
-rw-r--r--tmp/.gitkeep0
2 files changed, 2 insertions, 0 deletions
diff --git a/config.ru b/config.ru
new file mode 100644
index 000000000..30b00bfa1
--- /dev/null
+++ b/config.ru
@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + '/config/environment'
+run ActionController::Dispatcher.new
diff --git a/tmp/.gitkeep b/tmp/.gitkeep
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tmp/.gitkeep