aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2016-02-15 17:25:03 -0800
committerScott Jackson <daneren2005@gmail.com>2016-02-15 17:25:03 -0800
commit7e41d3820e155e2c93db545938955977e86911e3 (patch)
tree43c3fc3773432eea001cd6829f78e930d11d69f1 /app
parentf349bdaf104a52a01dd067744eb47d67b8b26bd5 (diff)
parent7e16b7b7ebc8e5e00e11eaa862527903ccc1f58a (diff)
downloaddsub-7e41d3820e155e2c93db545938955977e86911e3.tar.gz
dsub-7e41d3820e155e2c93db545938955977e86911e3.tar.bz2
dsub-7e41d3820e155e2c93db545938955977e86911e3.zip
Merge branch 'master' into switch-network
Diffstat (limited to 'app')
-rw-r--r--app/src/main/AndroidManifest.xml4
-rw-r--r--app/src/main/res/xml/changelog.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0aa3afc6..8060ce06 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="github.daneren2005.dsub"
android:installLocation="internalOnly"
- android:versionCode="173"
- android:versionName="5.1.5 Beta">
+ android:versionCode="174"
+ android:versionName="5.1.5">
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="github.daneren2005.dsub"
diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml
index 9ec84bcf..601f5ec6 100644
--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<changelog>
- <release version="5.1.5" versioncode="173" releasedate="2/11/2016">
+ <release version="5.1.5" versioncode="173" releasedate="2/15/2016">
<change>Toggle for Batch Mode on Now Playing</change>
<change>Admin tab: view/update music folders (Subsonic 5.2+)</change>
<change>Tag Browsing: can specify Music Folder (Subsonic 6.0+)</change>