Merge branch 'master' of https://github.com/LukeShu/leaguer

Conflicts:
	app/assets/stylesheets/matches.css.scss

1 files changed, 5 insertions, 0 deletions

diff --git a/bin/delayed_job b/bin/delayed_job
new file mode 100755
index 0000000..edf1959
--- /dev/null
+++ b/bin/delayed_job
@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
+require 'delayed/command'
+Delayed::Command.new(ARGV).daemonize