chiark / gitweb /
~ianmdlvl / fdroidserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 874565f 7575051)
Merge branch 'master' of gitorious.org:f-droid/fdroidserver
authorCiaran Gultnieks <ciaran@ciarang.com>
Thu, 16 Jan 2014 10:18:10 +0000 (10:18 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Thu, 16 Jan 2014 10:18:10 +0000 (10:18 +0000)
1  2 
fdroidserver/build.py patch | diff1 | diff2 | blob | history
fdroidserver/common.py patch | diff1 | diff2 | blob | history

diff --cc fdroidserver/build.py
Simple merge
diff --cc fdroidserver/common.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.