chiark / gitweb /
~ianmdlvl / fdroidserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c344c31 6debb3e)
Merge branch 'fix-build-and-vlc' into 'master'
authorCiaran Gultnieks <ciaran@ciarang.com>
Tue, 7 Feb 2017 13:27:56 +0000 (13:27 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Tue, 7 Feb 2017 13:27:56 +0000 (13:27 +0000)
fix CI, makebuildserver, and VLC build

See merge request !204


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.