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)
Conflicts:
lib/api/projects.rb

1  2 
app/models/project.rb
config/routes.rb
lib/api/projects.rb
spec/models/project_spec.rb

Simple merge
Simple merge
Simple merge
Simple merge