chiark / gitweb /
~ianmdlvl / fdroidserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67b8825 e069da3)
Merge branch 'master' into verbose-rewrite
authorDaniel Martí <mvdan@mvdan.cc>
Sat, 2 Nov 2013 21:36:55 +0000 (22:36 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Sat, 2 Nov 2013 21:36:55 +0000 (22:36 +0100)
1  2 
fdroidserver/common.py patch | diff1 | diff2 | blob | history
fdroidserver/update.py patch | diff1 | diff2 | blob | history

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