diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-11-12 22:13:57 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-12 22:13:57 +0100 |
| commit | c077cdaba70eac154909cad412ece409acc2e688 (patch) | |
| tree | 7d13d319ce62475de15014406635f32a8742ca4b /public/emoji/1f387.svg | |
| parent | 67125534bc0fd48a45d6cb17a5c78712d8e87150 (diff) | |
| parent | 9870b175b477bbc984fc7945f1ebe07e3f2b0053 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.
Diffstat (limited to 'public/emoji/1f387.svg')
0 files changed, 0 insertions, 0 deletions