summaryrefslogtreecommitdiff
path: root/spec/javascripts/u2f
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-11-02 12:09:20 +0200
committerSimon Knox <psimyn@gmail.com>2017-11-02 12:09:20 +0200
commit64549f7025dd405cbc08d85b514808c28e4685e3 (patch)
tree9b791f7fbffaf482adfefa516bb7e7d21f8020cd /spec/javascripts/u2f
parentad2d796353d8ba434810694bf11daf867489cbb6 (diff)
downloadgitlab-ce-64549f7025dd405cbc08d85b514808c28e4685e3.tar.gz
fix bad master merge
Diffstat (limited to 'spec/javascripts/u2f')
0 files changed, 0 insertions, 0 deletions