Merge remote-tracking branch 'upstream/pull/3301'
This commit is contained in:
commit
8cef62cd2c
16 changed files with 273 additions and 56 deletions
1
Gemfile
1
Gemfile
|
@ -49,6 +49,7 @@ gem "cancancan"
|
|||
gem "composite_primary_keys", "~> 14.0.0"
|
||||
gem "config"
|
||||
gem "delayed_job_active_record"
|
||||
gem "frozen_record"
|
||||
gem "http_accept_language", "~> 2.1.1"
|
||||
gem "i18n-js", "~> 3.9.2"
|
||||
gem "oauth-plugin", ">= 0.5.1"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue