diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
| commit | a942ad3062285b6b4984fe92f9bd610829f04456 (patch) | |
| tree | 2476b65436959dda09871ee96edca53b53201b96 /public/emoji/1f595-1f3fe.svg | |
| parent | 7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (diff) | |
| parent | 32f950a7a8d3acfed43d76cb21d0fc06a471bafe (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.
Diffstat (limited to 'public/emoji/1f595-1f3fe.svg')
0 files changed, 0 insertions, 0 deletions