Compare commits

merge into: cwtch.im:trunk

cwtch.im:1.4.0-release

cwtch.im:1.5-upgrades

cwtch.im:android-fix

cwtch.im:appbarColor

cwtch.im:custom_tor_config

cwtch.im:fixAcceptBlock

cwtch.im:fixAndroidAttrInv

cwtch.im:fixLeave

cwtch.im:fixSaveHist

cwtch.im:fix_295

cwtch.im:fix_debug_error_add_contact

cwtch.im:getinfo

cwtch.im:ios_build_port

cwtch.im:l10nup

cwtch.im:messageCache

cwtch.im:quote

cwtch.im:trunk

cwtch.im:v152

...

pull from: cwtch.im:trunk

cwtch.im:1.4.0-release

cwtch.im:1.5-upgrades

cwtch.im:android-fix

cwtch.im:appbarColor

cwtch.im:custom_tor_config

cwtch.im:fixAcceptBlock

cwtch.im:fixAndroidAttrInv

cwtch.im:fixLeave

cwtch.im:fixSaveHist

cwtch.im:fix_295

cwtch.im:fix_debug_error_add_contact

cwtch.im:getinfo

cwtch.im:ios_build_port

cwtch.im:l10nup

cwtch.im:messageCache

cwtch.im:quote

cwtch.im:trunk

cwtch.im:v152

These branches are equal. There is no need to create a pull request.