⚲
Project
General
Profile
Sign in
Register
Home
Projects
Help
Search
:
Foreman
All Projects
Overview
Activity
Roadmap
Issues
Wiki
Repository
«
Previous
|
Next
»
Revision 86fb12c1
Added by
Ohad Levy
almost 12 years
ago
ID
86fb12c1e1009385163d2d255ae6e519f18ea452
cleanup after merge conflict with latest develop branch
Changes
View differences
added
modified
copied
renamed
deleted
Gemfile
(
diff
)
Rakefile
(
diff
)
app
controllers
api
base_controller.rb
(
diff
)
v1
base_controller.rb
(
diff
)
bookmarks_controller.rb
(
diff
)
operatingsystems_controller.rb
(
diff
)
views
api
v1
operatingsystems
show.json.rabl
(
diff
)
update.json.rabl
bundler.d
development.rb
(
diff
)
test.rb
(
diff
)
config
initializers
restapi.rb
routes.rb
(
diff
)
Loading...
cleanup after merge conflict with latest develop branch