chiark / gitweb /
~ianmdlvl / fdroidserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1c90ac 4cb7e34)
Merge branch 'gradle' (finally!)
authorDaniel Martí <mvdan@mvdan.cc>
Wed, 14 Aug 2013 10:03:19 +0000 (12:03 +0200)
committerDaniel Martí <mvdan@mvdan.cc>
Wed, 14 Aug 2013 10:03:19 +0000 (12:03 +0200)
Conflicts:
fdroidserver/checkupdates.py

1  2 
fdroidserver/common.py patch | diff1 | diff2 | blob | history

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