summaryrefslogtreecommitdiff
path: root/lib/api/notes.rb
diff options
context:
space:
mode:
authorSebastian Ziebell <sebastian.ziebell@asquera.de>2013-02-20 12:43:32 +0100
committerSebastian Ziebell <sebastian.ziebell@asquera.de>2013-02-20 12:43:32 +0100
commiteefb27f5ae0edf0c005eb8ce6da56cbd17c9aa8a (patch)
tree9dc7d17953ee7851e1934903b45faf5f18d860a2 /lib/api/notes.rb
parent1b97a2eee8b89320de891e3ae8496adfa7f3a84b (diff)
parentb7ac654b88aa9b03f431d93c25e397ff2bc66a7a (diff)
downloadgitlab-ce-eefb27f5ae0edf0c005eb8ce6da56cbd17c9aa8a.tar.gz
Merge branch 'master' into fixes/api
Conflicts: spec/requests/api/projects_spec.rb
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions