diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-30 17:52:08 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-30 17:52:08 +0100 |
| commit | 1c448d647488dc3dd3b72e9fe15efb971612157c (patch) | |
| tree | 2b31e4ed019a29043aa07d9d95e7f8b64e309bbd /public/emoji/1f44f-1f3ff.svg | |
| parent | 7e18e95716052d5566f2e31559cbe4a68268f493 (diff) | |
| parent | 66019b0ec4aaa584e58e91583425ed7c0d55c28e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.
Diffstat (limited to 'public/emoji/1f44f-1f3ff.svg')
0 files changed, 0 insertions, 0 deletions