summaryrefslogtreecommitdiff
path: root/lib/api/notes.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-01 16:05:51 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-01 16:05:51 +0200
commit5c3cb47c16cacd8e9056f2a68978d69bc153a0f8 (patch)
tree39204ec0a55c20310d1a92c5958ef7522ac86135 /lib/api/notes.rb
parenta73e58f70b264b36b3291bba9a8a2789235ccadb (diff)
parent2f1f05d431d1df062e46365930b98b358554a07d (diff)
downloadgitlab-ce-5c3cb47c16cacd8e9056f2a68978d69bc153a0f8.tar.gz
Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions
Conflicts: db/schema.rb
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions