Project

General

Profile

« Previous | Next » 

Revision 86fb12c1

Added by Ohad Levy almost 12 years ago

  • ID 86fb12c1e1009385163d2d255ae6e519f18ea452

cleanup after merge conflict with latest develop branch

View differences:

app/views/api/v1/operatingsystems/show.json.rabl
object @operatingsystem
attributes :name, :id
attributes :id, :name, :major, :minor, :family, :release_name

Also available in: Unified diff