OSDN Git Service

Merge branch 'master' into fixes/api
authorSebastian Ziebell <sebastian.ziebell@asquera.de>
Tue, 5 Mar 2013 21:29:49 +0000 (22:29 +0100)
committerSebastian Ziebell <sebastian.ziebell@asquera.de>
Tue, 5 Mar 2013 21:29:49 +0000 (22:29 +0100)
commit61cfa2a7a6e1d4557b69e17c537656e8a0201ac8
treef868b5a1d870a42afe57e2b4dbbf35c9445c002b
parentd269d107d86c600ab2add651f47cced8f601ae84
parent6beae84ea37e03e68affd2b69fba25f45a4e5386
Merge branch 'master' into fixes/api

Conflicts:
lib/api/projects.rb
app/models/project.rb
config/routes.rb
lib/api/projects.rb
spec/models/project_spec.rb