diff options
| author | Joseph Donofry <joedonofry@gmail.com> | 2020-05-07 22:21:06 -0400 |
|---|---|---|
| committer | Joseph Donofry <joedonofry@gmail.com> | 2020-05-07 22:21:06 -0400 |
| commit | 5b9611dcd3ec033b8206081dfc76fcba68811af6 (patch) | |
| tree | 22b214429c415cc7e00b7bcf0cf1ac4018aca5f7 | |
| parent | merge master into reactions (diff) | |
| parent | Fix redaction color change that accidentally got committed (diff) | |
| download | nheko-5b9611dcd3ec033b8206081dfc76fcba68811af6.tar.xz | |
Merge branch 'master' into reactions
| -rw-r--r-- | resources/qml/delegates/Pill.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/resources/qml/delegates/Pill.qml b/resources/qml/delegates/Pill.qml |
