summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-08 10:56:37 +0000
committerRémy Coutable <remy@rymai.me>2017-06-08 10:56:37 +0000
commit1f98beba79b16fc0167f8b3396b58d047edade37 (patch)
tree12eff99624dbeb61135919b1261f574681792087 /lib/api
parent8ce11fc388bc168368b1e0a65659bb45c76a4a08 (diff)
parent13bd4b028a5d83e63026dc0023c090c677fceb3b (diff)
downloadgitlab-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 'lib/api')
0 files changed, 0 insertions, 0 deletions