summaryrefslogtreecommitdiff
path: root/lib/json_web_token/token.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-11-08 08:51:30 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-11-08 08:51:30 +0000
commitb3b9817e5100ae2e827794d87ac6a6649571eddc (patch)
tree76f13ac4eee8a1f0c34248066d05863beb7f0e90 /lib/json_web_token/token.rb
parent32c4d7721b5e4cd99ff84d5f12163a2514f616b9 (diff)
parent198402b38b59a43aa6e50259d7c13c0097dbdfac (diff)
downloadgitlab-ce-b3b9817e5100ae2e827794d87ac6a6649571eddc.tar.gz
Merge branch 'osw-revert-comment-in-any-diff-line' into 'master'
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'" See merge request gitlab-org/gitlab-ce!22891
Diffstat (limited to 'lib/json_web_token/token.rb')
0 files changed, 0 insertions, 0 deletions