Revision 86fb12c1
Added by Ohad Levy almost 12 years ago
- ID 86fb12c1e1009385163d2d255ae6e519f18ea452
| Gemfile | ||
|---|---|---|
|
gem 'net-ldap'
|
||
|
gem "safemode", "~> 1.0.1"
|
||
|
gem 'uuidtools'
|
||
|
gem "restapi", :git => "git://github.com/Katello/rails-restapi.git", :branch => "katello"
|
||
|
gem 'rabl'
|
||
|
# Previous versions collide with Environment model
|
||
|
gem "ruby_parser", ">= 2.3.1"
|
||
Also available in: Unified diff
cleanup after merge conflict with latest develop branch