about summary refs log tree commit diff
path: root/public/emoji/1f6cc-1f3fb.svg
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-06-26 22:54:09 +0200
committerThibaut Girka <thib@sitedethib.com>2019-06-26 23:19:22 +0200
commitaaec64a500346502aedefff446f1d8688ac5077c (patch)
treeb24b5c7fa4b500b00c85cee3ef2cbb553d763f4d /public/emoji/1f6cc-1f3fb.svg
parent9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff)
parent3086c645fde2345d34e401bdf3e2f19f19da3294 (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 'public/emoji/1f6cc-1f3fb.svg')
0 files changed, 0 insertions, 0 deletions