diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-18 09:17:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 09:17:20 +0200 |
| commit | c44579c42dd03c187be08978c54bdfe37d56cc45 (patch) | |
| tree | 7a235fc9422d71f56993b4682b06439310f21f65 /app/controllers/admin/roles_controller.rb | |
| parent | 1fb78602c56b7bf52dcf383fea7a4c45ce568655 (diff) | |
| parent | 7dbed4dab93d3eaf79b7e7e4a61f52782909d1ae (diff) | |
Merge pull request #585 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/roles_controller.rb')
0 files changed, 0 insertions, 0 deletions