diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2017-11-10 15:40:01 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2017-11-10 15:40:01 +0100 |
| commit | f39e31af92f3ae6689697685d008f0487a5be351 (patch) | |
| tree | c00654dbb28817cbfdca8223c1f86d38c706e163 /src/components/layout | |
| parent | feat(App): Respect System DoNotDisturb mode for service audio (diff) | |
| parent | Merge pull request #248 from meetfranz/feature/192-display-disabled-services (diff) | |
| download | ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.tar.gz ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.tar.zst ferdium-app-f39e31af92f3ae6689697685d008f0487a5be351.zip | |
Merge branch 'develop' into feature/mute-service
# Conflicts:
# src/components/services/content/ServiceWebview.js
# src/components/services/content/Services.js
# src/components/services/tabs/TabItem.js
# src/containers/layout/AppLayoutContainer.js
Diffstat (limited to 'src/components/layout')
0 files changed, 0 insertions, 0 deletions