diff options
author | Rémy Coutable <remy@rymai.me> | 2017-06-08 10:56:37 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-06-08 10:56:37 +0000 |
commit | 1f98beba79b16fc0167f8b3396b58d047edade37 (patch) | |
tree | 12eff99624dbeb61135919b1261f574681792087 /app/views | |
parent | 8ce11fc388bc168368b1e0a65659bb45c76a4a08 (diff) | |
parent | 13bd4b028a5d83e63026dc0023c090c677fceb3b (diff) | |
download | gitlab-ce-1f98beba79b16fc0167f8b3396b58d047edade37.tar.gz |
Merge branch 'clean-up-project-for-merge-conflicts' into 'master'
Clean up the Project model to reduce conflicts
See merge request !11967
Diffstat (limited to 'app/views')
0 files changed, 0 insertions, 0 deletions