diff options
author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-20 14:50:32 +0100 |
---|---|---|
committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-20 15:59:59 +0100 |
commit | 479cdc2cac78241109d2cb9d8cfd22d36319d367 (patch) | |
tree | 2d4aee23df199f078516105b2266cacca9c94410 /app/controllers/groups_controller.rb | |
parent | 2b0e8b86d8aa35ac094d18bfefaa81af916347fa (diff) | |
download | gitlab-ce-479cdc2cac78241109d2cb9d8cfd22d36319d367.tar.gz |
Fix bad merge [ci skip]
Diffstat (limited to 'app/controllers/groups_controller.rb')
0 files changed, 0 insertions, 0 deletions