diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-16 11:40:22 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-16 11:40:22 +0100 |
| commit | ad33f4bbbdf204507e31b7d9ab2ed24b5f7bdcdd (patch) | |
| tree | d004c2b6f4f1dfd9dcc5db465aa9f9e9ac98efd0 /Gemfile | |
| parent | 4194d7f689c3f70c9247e8006694cfcf667ebaf0 (diff) | |
| parent | 962e07e58451f5d21cab9804191139be0f20189b (diff) | |
Merge branch 'ability_fix' into develop
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4,7 +4,7 @@ gem 'rails', '3.2.11' gem 'bcrypt-ruby' gem 'sqlite3' gem 'mysql2' -gem 'cancan' +gem 'cancan', '1.6.7' gem 'state_machine' gem 'acts_as_list' gem 'dalli' # memcached |