about summary refs log tree commit diff
path: root/public/emoji/1f3f8.svg
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-05-26 15:41:40 +0200
committerThibaut Girka <thib@sitedethib.com>2019-05-26 15:41:40 +0200
commit20d01a954e0961eed41954bd23713e91a1dafe14 (patch)
treea7a8ba480fabe4f669755ef4c0b78e213b1ea2ac /public/emoji/1f3f8.svg
parentfdb3952b203d562ba32ba3131d941fa4ea07d7b3 (diff)
parent63483ee543eb6c81e2cf6450a682cdb657e92751 (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/1f3f8.svg')
0 files changed, 0 insertions, 0 deletions