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)
1  2 
res/values/strings.xml
src/com/owncloud/android/ui/activity/LogHistoryActivity.java

Simple merge