chiark / gitweb /
~ianmdlvl / fdroidserver.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2427076 7e9d46d)
Merge commit 'refs/merge-requests/112' of git://gitorious.org/f-droid/fdroidserver...
authorCiaran Gultnieks <ciaran@ciarang.com>
Wed, 6 Mar 2013 18:20:52 +0000 (18:20 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Wed, 6 Mar 2013 18:20:52 +0000 (18:20 +0000)
commit81c3710f577aa3934b7f1515ebb9daaae40f4123
tree2f0ec493412bc6e0dcd89189b544b6ab5aeb9279tree | snapshot
parent242707602b5359a2687227cbc7ced5776d78e6f1commit | diff
parent7e9d46d427f49df4f373c004e1f00f72fa72c6d2commit | diff
Merge commit 'refs/merge-requests/112' of git://gitorious.org/f-droid/fdroidserver into merge-requests/112

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