Merge branch 'master' of bitbucket.org:M66B/fairemail

Browse Source

Conflicts:
	app/src/main/java/eu/faircode/email/ActivityView.java

...

This commit is contained in:

M66B 2018-11-13 15:16:50 +01:00

parent eecd3c10dd 6ca6808bf3

commit c7afdb2d89

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 Not Available