chiark / gitweb /
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)
commit2fdd274580c84b778698bfa0c45e47e6bee846e7
treeae2343a52a6e888c13fcc93e554d95364e86264e
parentb1c90ace716250430dd13c93be8b6e91b8770ad0
parent4cb7e340d15bb83d9dc7a557c0dd49a8d6219cea
Merge branch 'gradle' (finally!)

Conflicts:
fdroidserver/checkupdates.py
fdroidserver/common.py