diff options
| author | Dan Halbert <halbert@adafruit.com> | 2020-08-15 15:12:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-15 15:12:21 -0400 |
| commit | 41be0fdd81a1c2d0efd574248f23a15b6bda5734 (patch) | |
| tree | 65991efbbb471063a36fde3043454f2b5e59389e /shared-module | |
| parent | 98469322b7d35748f0f2cb03cc5bd4d470ea6339 (diff) | |
| parent | ac15726e1339b0c3125e3c67afff4d4b42116a1a (diff) | |
Merge pull request #3283 from jepler/fix-weblate-conflict
Fix weblate conflict
Diffstat (limited to 'shared-module')
0 files changed, 0 insertions, 0 deletions