Compare commits
merge into: cwtch.im:master
cwtch.im:addcontactbugfix
cwtch.im:autoblock
cwtch.im:autoblocking
cwtch.im:bigmerge
cwtch.im:bugfix
cwtch.im:bugfix-1
cwtch.im:buildbot
cwtch.im:cleanup
cwtch.im:clifix
cwtch.im:common_fields
cwtch.im:configmap
cwtch.im:constructed
cwtch.im:contact-level-attributes
cwtch.im:cwtchutil
cwtch.im:deps
cwtch.im:detports
cwtch.im:detports2
cwtch.im:drone
cwtch.im:ebf
cwtch.im:ebf2019011512
cwtch.im:ebf201901221109
cwtch.im:ebf201901281158
cwtch.im:ebf201902021718
cwtch.im:ebf201902111339
cwtch.im:ebf201903251154
cwtch.im:event_times
cwtch.im:eventmanager
cwtch.im:export-fix
cwtch.im:first_contact
cwtch.im:full_block
cwtch.im:gating
cwtch.im:group-attributes
cwtch.im:group-map-fix
cwtch.im:group_create_ui
cwtch.im:groupimportfix
cwtch.im:groupinvitefix
cwtch.im:handlers
cwtch.im:identity
cwtch.im:ineffassign
cwtch.im:initial_message
cwtch.im:leave_server
cwtch.im:master
cwtch.im:merging
cwtch.im:module
cwtch.im:movelisten
cwtch.im:mxlength
cwtch.im:nit
cwtch.im:p2ptimeline
cwtch.im:peer_history
cwtch.im:peerdata
cwtch.im:peersend
cwtch.im:plugin
cwtch.im:postalpha
cwtch.im:profile-password
cwtch.im:profile-password-2
cwtch.im:profilefix
cwtch.im:profiles
cwtch.im:protocolengine
cwtch.im:replace-extra25519
cwtch.im:retry
cwtch.im:ricochet1.0.1
cwtch.im:server-check
cwtch.im:server_support
cwtch.im:servercheck
cwtch.im:sorting
cwtch.im:specify-events
cwtch.im:storage-refactor
cwtch.im:storagebugfix
cwtch.im:storagerefactor
cwtch.im:tapir-1.8
cwtch.im:tapir-peer
cwtch.im:tapir_server
cwtch.im:testfix
cwtch.im:thefuture
cwtch.im:tor
cwtch.im:tor-manager
cwtch.im:torrc
cwtch.im:update-libricochet
cwtch.im:update-tapir
cwtch.im:update_group_checks
cwtch.im:upgrade-tapir
cwtch.im:waitfaster
cwtch.im:windows
cwtch.im:blocking-thread-safe
cwtch.im:export
cwtch.im:integ_test_fix
gpestana:gpestana/peer-test-coverage
gpestana:peer-test-coverage
gpestana:blocking-thread-safe
gpestana:buildbot
gpestana:drone
gpestana:export
gpestana:integ_test_fix
gpestana:master
gpestana:profile-password
gpestana:profile-password-2
gpestana:tor
gpestana:tor-manager
pull from: gpestana:master
gpestana:gpestana/peer-test-coverage
gpestana:peer-test-coverage
gpestana:blocking-thread-safe
gpestana:buildbot
gpestana:drone
gpestana:export
gpestana:integ_test_fix
gpestana:master
gpestana:profile-password
gpestana:profile-password-2
gpestana:tor
gpestana:tor-manager
cwtch.im:addcontactbugfix
cwtch.im:autoblock
cwtch.im:autoblocking
cwtch.im:bigmerge
cwtch.im:bugfix
cwtch.im:bugfix-1
cwtch.im:buildbot
cwtch.im:cleanup
cwtch.im:clifix
cwtch.im:common_fields
cwtch.im:configmap
cwtch.im:constructed
cwtch.im:contact-level-attributes
cwtch.im:cwtchutil
cwtch.im:deps
cwtch.im:detports
cwtch.im:detports2
cwtch.im:drone
cwtch.im:ebf
cwtch.im:ebf2019011512
cwtch.im:ebf201901221109
cwtch.im:ebf201901281158
cwtch.im:ebf201902021718
cwtch.im:ebf201902111339
cwtch.im:ebf201903251154
cwtch.im:event_times
cwtch.im:eventmanager
cwtch.im:export-fix
cwtch.im:first_contact
cwtch.im:full_block
cwtch.im:gating
cwtch.im:group-attributes
cwtch.im:group-map-fix
cwtch.im:group_create_ui
cwtch.im:groupimportfix
cwtch.im:groupinvitefix
cwtch.im:handlers
cwtch.im:identity
cwtch.im:ineffassign
cwtch.im:initial_message
cwtch.im:leave_server
cwtch.im:master
cwtch.im:merging
cwtch.im:module
cwtch.im:movelisten
cwtch.im:mxlength
cwtch.im:nit
cwtch.im:p2ptimeline
cwtch.im:peer_history
cwtch.im:peerdata
cwtch.im:peersend
cwtch.im:plugin
cwtch.im:postalpha
cwtch.im:profile-password
cwtch.im:profile-password-2
cwtch.im:profilefix
cwtch.im:profiles
cwtch.im:protocolengine
cwtch.im:replace-extra25519
cwtch.im:retry
cwtch.im:ricochet1.0.1
cwtch.im:server-check
cwtch.im:server_support
cwtch.im:servercheck
cwtch.im:sorting
cwtch.im:specify-events
cwtch.im:storage-refactor
cwtch.im:storagebugfix
cwtch.im:storagerefactor
cwtch.im:tapir-1.8
cwtch.im:tapir-peer
cwtch.im:tapir_server
cwtch.im:testfix
cwtch.im:thefuture
cwtch.im:tor
cwtch.im:tor-manager
cwtch.im:torrc
cwtch.im:update-libricochet
cwtch.im:update-tapir
cwtch.im:update_group_checks
cwtch.im:upgrade-tapir
cwtch.im:waitfaster
cwtch.im:windows
cwtch.im:blocking-thread-safe
cwtch.im:export
cwtch.im:integ_test_fix
These branches are equal. There is no need to create a pull request.