diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-07 13:56:48 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-07 13:56:48 +0200 |
| commit | 04534604c654060eca24628247fdb51b7ff5372a (patch) | |
| tree | f8ae222e84056fb2674d23187e66517da1fc2af9 /app/controllers/invites_controller.rb | |
| parent | 8400ddca7155005ab79485ed6054c04ea3ca5667 (diff) | |
| parent | ac33f1aedd9a6c72c6c176afb1f5d62a1ce5d44d (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml
Diffstat (limited to 'app/controllers/invites_controller.rb')
0 files changed, 0 insertions, 0 deletions