diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-21 01:20:51 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-21 01:20:51 +0200 |
| commit | e45e6ba2c3e25afb138e5f0ece71c6f677f2ab86 (patch) | |
| tree | d648ae6a8335ceda3007b881427ce4a7770cff56 /lib/api/notes.rb | |
| parent | bcc04adb1342155d4ec2b670702406285145cb32 (diff) | |
| parent | 0f7d47f695afa051374996cb1c72bc3ec55820c5 (diff) | |
| download | gitlab-ce-e45e6ba2c3e25afb138e5f0ece71c6f677f2ab86.tar.gz | |
Merge branch 'master' into sidebar-nav
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/layouts/group.html.haml
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions