diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-16 15:01:27 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-16 15:01:27 +0200 |
| commit | b3a0a1c3155702e2deddade0fea3e79087b40da4 (patch) | |
| tree | 096bf8b46f1d9dc4be16cf29551a27d8fd6c8d7b /CONTRIBUTING.md | |
| parent | 8ac52f49c024775311a0736ddad964e85c8f6ed2 (diff) | |
| parent | 2a747d386dbdc05453fce6b8be3f483e8cd9e796 (diff) | |
| download | gitlab-ce-b3a0a1c3155702e2deddade0fea3e79087b40da4.tar.gz | |
fixed merge conflicts on UI branch
Diffstat (limited to 'CONTRIBUTING.md')
0 files changed, 0 insertions, 0 deletions