Merge remote-tracking branch 'origin/master'

Browse source

# Conflicts:
#	app/src/main/res/values/strings.xml

...

This commit is contained in:

h4h13 2018-08-08 16:01:47 +05:30

parent 11b2c289ad 5ad575f990

commit 10d1f7b9e1

2 changed files with 533 additions and 523 deletions

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

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

1045

app/src/main/res/values/strings.xml

View file

File diff suppressed because it is too large Load diff