diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-04 13:16:48 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-04 13:16:48 +0100 |
| commit | 6fea7c386ff27e5081ff3532b06f71d29eee956b (patch) | |
| tree | e1a1035725399135e86a6341c8349dfdab417107 /lib/api/notes.rb | |
| parent | d231b6b9182ce9f68f267af0a073136c898f6892 (diff) | |
| parent | e933a50b6b8e7feec76bcc71313c14736967cd7a (diff) | |
| download | gitlab-ce-6fea7c386ff27e5081ff3532b06f71d29eee956b.tar.gz | |
Merge remote-tracking branch 'origin/master' into ci-permissions
# Conflicts:
# app/views/projects/builds/index.html.haml
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions