about summary refs log tree commit diff
path: root/public/emoji/1f519.svg
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-09-11 16:51:26 +0200
committerThibaut Girka <thib@sitedethib.com>2018-09-11 16:51:26 +0200
commitcd99255698354f3b5ec1c0d5d9bc1b4fb9bffdf3 (patch)
tree0486b73191a98645e0620fefe8743f4a0c44bef5 /public/emoji/1f519.svg
parent65f625cf237feb55a21495606d5e2c258bbe50cc (diff)
parentbda0f7ac7353a63b42ca99b2e7d4e80a3b03b850 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
Diffstat (limited to 'public/emoji/1f519.svg')
0 files changed, 0 insertions, 0 deletions