Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	app/src/main/java/com/keylesspalace/tusky/MainActivity.java

...

This commit is contained in:

Eugen Rochko 2017-03-10 04:43:01 +01:00

parent 473f7f75f1 68e10f77f4

commit 63b154fce1

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