diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 12:08:03 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 12:08:03 +0300 |
| commit | 71f6143552a47209d4d83c35260db608cac7de1a (patch) | |
| tree | b5c16ae980c71adc7af6ef803369d2f0f33d4bb3 /lib/api/notes.rb | |
| parent | 63c5911961909b12b328b4182ba0f4b0e13c1bd6 (diff) | |
| parent | aac27550457eaf0503ce9bf7b04c18141ed317af (diff) | |
| download | gitlab-ce-71f6143552a47209d4d83c35260db608cac7de1a.tar.gz | |
Merge branch 'master' into new-sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/snippets_controller.rb
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions