diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-31 12:03:16 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-31 12:03:16 +0100 |
| commit | 2a7ddaef6af6b32308b1f5dd9b3f3b53fc11d9fc (patch) | |
| tree | 79f3ecd73c90a2d2377f4d64201ecc7e742b1ff4 /Gemfile.lock | |
| parent | 65e12d5d0af48a850536fc8940e360f0baa2fe27 (diff) | |
| parent | ea436f31b3462b837d6b092d7bc655f7ea1f72f5 (diff) | |
Merge branch 'delayed_job' into develop
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 33e77ff..6bb234f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,8 +210,8 @@ DEPENDENCIES carrierwave coffee-rails (~> 3.2.1) compass-rails + daemons dalli - delayed_job delayed_job_active_record factory_girl factory_girl_rails |