summaryrefslogtreecommitdiff
path: root/lib/uploaded_file.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-07-25 19:47:09 +0100
committerFatih Acet <acetfatih@gmail.com>2016-08-12 23:24:43 +0300
commitdf2ed097b730c8ba0b79cac8cc3dbfcb0cf587cb (patch)
treecf81b693a81e9bca1a5044706a4ba12c041bf55f /lib/uploaded_file.rb
parentff15fbf10c8c32fde876e5c9578fdc2161b7905c (diff)
downloadgitlab-ce-df2ed097b730c8ba0b79cac8cc3dbfcb0cf587cb.tar.gz
Add backend for merge conflicts reading
Diffstat (limited to 'lib/uploaded_file.rb')
0 files changed, 0 insertions, 0 deletions