diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-26 15:41:40 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-26 15:41:40 +0200 |
| commit | 20d01a954e0961eed41954bd23713e91a1dafe14 (patch) | |
| tree | a7a8ba480fabe4f669755ef4c0b78e213b1ea2ac /public/emoji/1f487-1f3fc-200d-2642-fe0f.svg | |
| parent | fdb3952b203d562ba32ba3131d941fa4ea07d7b3 (diff) | |
| parent | 63483ee543eb6c81e2cf6450a682cdb657e92751 (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 Conflicts due to the addition of a new preference upstream, “advanced layout”.
Diffstat (limited to 'public/emoji/1f487-1f3fc-200d-2642-fe0f.svg')
0 files changed, 0 insertions, 0 deletions