Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

Browse source

Conflicts:
	src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java

...

This commit is contained in:

steckbrief 2016-03-29 22:38:11 +02:00

parent a0c4b022de 37c5a7c522

commit 074ff79fd9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available