OSDN Git Service

Merge branch 'master' into fixes/api
authorSebastian Ziebell <sebastian.ziebell@asquera.de>
Fri, 8 Feb 2013 09:32:42 +0000 (10:32 +0100)
committerSebastian Ziebell <sebastian.ziebell@asquera.de>
Fri, 8 Feb 2013 09:32:42 +0000 (10:32 +0100)
commit8045a81bcf5822f1992442750e1484a93c368229
tree94ce2b257f3ba002ac1a0fde70b69b622304810d
parent5d8a99f10429168e6471fdd1843f5045a10a84b3
parent2f0a75ab77af430f682d67aa9bb865007d832795
Merge branch 'master' into fixes/api
config/routes.rb
doc/api/notes.md
doc/api/projects.md
lib/api.rb
lib/api/notes.rb
lib/api/projects.rb
spec/requests/api/notes_spec.rb
spec/requests/api/projects_spec.rb