diff options
| author | James Lopez <james@jameslopez.es> | 2016-05-23 09:09:02 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-05-23 09:09:02 +0200 |
| commit | 6e3df42ca33e7fb6b8d79647fe99c5a6e8159484 (patch) | |
| tree | d1998e8abab98b096ebbbea79f5a34a9c9a2167e /Gemfile | |
| parent | f2f345e6048f80e4d6510db102cd046fca43d4e4 (diff) | |
| parent | 53ad33e4ba1b079e4f2aebceb42a7301c5ce2e4a (diff) | |
| download | gitlab-ce-6e3df42ca33e7fb6b8d79647fe99c5a6e8159484.tar.gz | |
fix merge conflicts
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -325,7 +325,7 @@ gem "mail_room", "~> 0.7" gem 'email_reply_parser', '~> 0.5.8' ## CI -gem 'activerecord-session_store', '~> 0.1.0' +gem 'activerecord-session_store', '~> 1.0.0' gem "nested_form", '~> 0.3.2' # OAuth |