chiark / gitweb /
~ianmdlvl / fdroidserver.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 44d6255 cbfa2d3)
Merge commit 'refs/merge-requests/115' of git://gitorious.org/f-droid/fdroidserver...
authorCiaran Gultnieks <ciaran@ciarang.com>
Mon, 18 Mar 2013 17:33:20 +0000 (17:33 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Mon, 18 Mar 2013 17:33:20 +0000 (17:33 +0000)
commit02492c35633e9e2e7e5a07256d9e4d3840ca0ce9
tree2a659c8537bc835bce188d9ac174ff2334708124tree | snapshot
parent44d62557a420500ee08967946701c9196da83bf9commit | diff
parentcbfa2d35a4eb60f569a5d9aabf2607299fa837cdcommit | diff
Merge commit 'refs/merge-requests/115' of git://gitorious.org/f-droid/fdroidserver into merge-requests/115

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