Merge branch 'devel' of https://github.com/jcorporation/myMPD into devel

This commit is contained in:
jcorporation 2018-12-25 16:44:57 +01:00
commit a1eaf4c1f9
2 changed files with 4 additions and 1 deletions

View File

@ -4,7 +4,11 @@
pkgname=mympd
_pkgname=myMPD
<<<<<<< HEAD
pkgver=4.8.0
=======
pkgver=5.0.0
>>>>>>> cd588ab72e10ee934a8ac58f4add1dc9268ed79f
pkgrel=1
pkgdesc="myMPD is a standalone and mobile friendly web mpdclient."
arch=('x86_64' 'armv7h' 'aarch64')

1
debian/changelog vendored
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
mympd (4.8.0-1) stable; urgency=medium
* Release from master