diff options
| author | Timm Drevensek <abubadabu@gmail.com> | 2014-04-01 22:30:16 +0200 |
|---|---|---|
| committer | Timm Drevensek <abubadabu@gmail.com> | 2014-04-01 22:30:16 +0200 |
| commit | cb659e4c5a1c32bd2aa5c9994cd9d7b4a9841c9b (patch) | |
| tree | 4b28ca521d9d7420feb2ec705669b90e57a37d58 /app/models/merge_request.rb | |
| parent | ea82bcd396c9e6ab8542474ee70365297a4ff2dc (diff) | |
| parent | 3b0510a7c124a8511966ad4785757bd4d78998ac (diff) | |
| download | gitlab-ce-cb659e4c5a1c32bd2aa5c9994cd9d7b4a9841c9b.tar.gz | |
Merge branch 'master' into request/relative_submodules
Conflicts:
CHANGELOG
Diffstat (limited to 'app/models/merge_request.rb')
0 files changed, 0 insertions, 0 deletions