chiark / gitweb /
~ianmdlvl / fdroidserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e915f71 d6b0855)
Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver
authorHans-Emil Skogh <hansemil@gmail.com>
Sat, 21 Jan 2012 10:17:43 +0000 (11:17 +0100)
committerHans-Emil Skogh <hansemil@gmail.com>
Sat, 21 Jan 2012 10:17:43 +0000 (11:17 +0100)
Conflicts:
wp-fdroid/wp-fdroid.php

1  2 
wp-fdroid/wp-fdroid.php patch | diff1 | diff2 | blob | history

diff --cc wp-fdroid/wp-fdroid.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.