diff options
| author | Joseph Donofry <joedonofry@gmail.com> | 2021-01-11 17:51:39 -0500 |
|---|---|---|
| committer | Joseph Donofry <joedonofry@gmail.com> | 2021-01-11 17:51:39 -0500 |
| commit | 3ff8b3ad8c015d45a515ca381691cae43fc32a00 (patch) | |
| tree | edec1d1e7926d9c0e0beb68ca604cc6bcdc1ebf6 /src/UserSettingsPage.h | |
| parent | Add Ripple effects to qml buttons and avatar (diff) | |
| parent | Merge pull request #372 from deepbluev7/fix-pr-CI (diff) | |
| download | nheko-3ff8b3ad8c015d45a515ca381691cae43fc32a00.tar.xz | |
Merge master and fix conflicts
Diffstat (limited to 'src/UserSettingsPage.h')
| -rw-r--r-- | src/UserSettingsPage.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h |