chiark / gitweb /
~ianmdlvl / fdroidserver.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ba4d882 e404abc)
Merge commit 'refs/merge-requests/88' of git://gitorious.org/f-droid/fdroidserver...
authorCiaran Gultnieks <ciaran@ciarang.com>
Thu, 15 Mar 2012 16:37:51 +0000 (16:37 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Thu, 15 Mar 2012 16:37:51 +0000 (16:37 +0000)
commitb6c46d5ddc17d01358dff766da9b5762a9f3a752
treed5f988efa17995671aa07c7c393260e3bd93acc1tree | snapshot
parentba4d882bcccc9deca776ad82757c655864d49b85commit | diff
parente404abce21185e735c5315bae740c173aba3b282commit | diff
Merge commit 'refs/merge-requests/88' of git://gitorious.org/f-droid/fdroidserver into merge-requests/88

Conflicts:
fdroidserver/build.py
fdroidserver/build.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.