diff options
author | Scott Jackson <daneren2005@gmail.com> | 2017-04-17 17:19:49 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2017-04-17 17:19:49 -0700 |
commit | 8a7d214e7d7d5b47832f44de3e232e03ec7f10d3 (patch) | |
tree | 3e0790cc6d3c36287be13f4bc939c80aa8246b0e /app/src/main/res/menu/search.xml | |
parent | 544d65124e3e3a85694238da4639749f7c9f34ef (diff) | |
parent | 594e5ac1a5b86f495c60857e45c5eca16229faac (diff) | |
download | dsub-8a7d214e7d7d5b47832f44de3e232e03ec7f10d3.tar.gz dsub-8a7d214e7d7d5b47832f44de3e232e03ec7f10d3.tar.bz2 dsub-8a7d214e7d7d5b47832f44de3e232e03ec7f10d3.zip |
Merge branch 'enhanced-playback-speed' of https://github.com/SilentViking/Subsonic into SilentViking-enhanced-playback-speed
# Conflicts:
# app/src/main/java/github/daneren2005/dsub/util/Constants.java
Diffstat (limited to 'app/src/main/res/menu/search.xml')
0 files changed, 0 insertions, 0 deletions