diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-20 14:30:11 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-20 14:30:11 +0100 |
| commit | f0e417091c2cef32b560472a38f66cf6cdcaec15 (patch) | |
| tree | 1b4a06460786d2c9e35057ac9e5c1b54b2bef356 /lib/api/notes.rb | |
| parent | 512d826cc3e89bb577f485d4767d91185f3f0556 (diff) | |
| parent | ba1a453ef3dddf50a2c118f4490267b19a0b2cc8 (diff) | |
| download | gitlab-ce-f0e417091c2cef32b560472a38f66cf6cdcaec15.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