Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation
authorjabarros <jabarros@solidgear.es>
Wed, 10 Dec 2014 13:13:32 +0000 (14:13 +0100)
committerjabarros <jabarros@solidgear.es>
Wed, 10 Dec 2014 13:13:32 +0000 (14:13 +0100)
commitc34646aed37a51fc9499b9bef8e5b30c7e8e10a6
tree31060a1bf2005bee852965bc34c5d6955ff81c3d
parent700d4449779ee9702437103695a79a1cf7169e9c
parent8de07698d9130a001a325ee39a9ad64cf3b9b191
Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation
res/values/strings.xml
src/com/owncloud/android/ui/activity/LogHistoryActivity.java