projects / AndroidWeatherInformation / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63ed620 6fb3929)
Merge branch 'master' of https://github.com/gumartinm/AndroidWeatherInformation
authorGustavo Martin Morcuende <gu.martinm@gmail.com>
Tue, 30 Aug 2016 18:27:35 +0000 (20:27 +0200)
committerGustavo Martin Morcuende <gu.martinm@gmail.com>
Tue, 30 Aug 2016 18:27:35 +0000 (20:27 +0200)
Conflicts:
app/src/main/java/name/gumartinm/weather/information/httpclient/CustomHTTPClient.java


Trivial merge
Weather Information, App for Android