OSDN Git Service

Merge branch 'master' into fixes/api
authorSebastian Ziebell <sebastian.ziebell@asquera.de>
Wed, 20 Feb 2013 11:43:32 +0000 (12:43 +0100)
committerSebastian Ziebell <sebastian.ziebell@asquera.de>
Wed, 20 Feb 2013 11:43:32 +0000 (12:43 +0100)
commiteefb27f5ae0edf0c005eb8ce6da56cbd17c9aa8a
tree9dc7d17953ee7851e1934903b45faf5f18d860a2
parent1b97a2eee8b89320de891e3ae8496adfa7f3a84b
parentb7ac654b88aa9b03f431d93c25e397ff2bc66a7a
Merge branch 'master' into fixes/api

Conflicts:
spec/requests/api/projects_spec.rb
app/models/project.rb
config/routes.rb
doc/api/projects.md
lib/api/merge_requests.rb
lib/api/milestones.rb
lib/api/projects.rb
spec/requests/api/merge_requests_spec.rb
spec/requests/api/milestones_spec.rb
spec/requests/api/projects_spec.rb