Merge remote-tracking branch 'remotes/main/master' into self-signed

Browse Source

# Conflicts:
#	app/src/main/java/org/mian/gitnex/activities/LoginActivity.java

...

This commit is contained in:

anonTree1417 2020-04-02 23:07:20 +02:00

parent 59e8f6f94a 8234ad77e3

commit 63865fefec

1 changed files with 548 additions and 474 deletions

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

1022

app/src/main/java/org/mian/gitnex/activities/LoginActivity.java

File diff suppressed because it is too large Load Diff