diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-26 22:54:09 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-26 23:19:22 +0200 |
| commit | aaec64a500346502aedefff446f1d8688ac5077c (patch) | |
| tree | b24b5c7fa4b500b00c85cee3ef2cbb553d763f4d /app/serializers/rest | |
| parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) | |
| parent | 3086c645fde2345d34e401bdf3e2f19f19da3294 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml
Diffstat (limited to 'app/serializers/rest')
0 files changed, 0 insertions, 0 deletions