summaryrefslogtreecommitdiff
path: root/lib/api/notes.rb
diff options
context:
space:
mode:
authorSebastian Ziebell <sebastian.ziebell@asquera.de>2013-03-05 22:29:49 +0100
committerSebastian Ziebell <sebastian.ziebell@asquera.de>2013-03-05 22:29:49 +0100
commit61cfa2a7a6e1d4557b69e17c537656e8a0201ac8 (patch)
treef868b5a1d870a42afe57e2b4dbbf35c9445c002b /lib/api/notes.rb
parentd269d107d86c600ab2add651f47cced8f601ae84 (diff)
parent6beae84ea37e03e68affd2b69fba25f45a4e5386 (diff)
downloadgitlab-ce-61cfa2a7a6e1d4557b69e17c537656e8a0201ac8.tar.gz
Merge branch 'master' into fixes/api
Conflicts: lib/api/projects.rb
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions