diff options
author | Phil Hughes <me@iamphill.com> | 2016-08-30 10:43:09 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-08-30 10:43:09 +0100 |
commit | 85f6244ce852fb6b788ea660c7d0cbe14ec10a20 (patch) | |
tree | ec29f6c01ea8e4ac774f3dae874a3a3abf97267b /app/controllers/jwt_controller.rb | |
parent | 2bee8e7db927d2bc2c5912b98dfe52d3c3c40fbd (diff) | |
parent | 2778dec131c2afac9fcdb2c42365b69099a5ae5b (diff) | |
download | gitlab-ce-85f6244ce852fb6b788ea660c7d0cbe14ec10a20.tar.gz |
Merge branch 'master' into build-cancel-spinner
Diffstat (limited to 'app/controllers/jwt_controller.rb')
0 files changed, 0 insertions, 0 deletions