Merge branch 'jobs_and_mail' of github.com:Rulingcom/orbit into jobs_and_mail

Browse Source

Conflicts:
	config/initializers/resque.rb

...

This commit is contained in:

Christophe Vilayphiou committed 2012-05-08 20:32:06 +08:00

2 parents 7af17f19ac d29b89ad1a

commit 3709d38621

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available