Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into develop

Browse source

# Conflicts:
#	Habitica/res/values/strings.xml

...

This commit is contained in:

Phillip Thelen 2019-04-05 09:46:26 +02:00

parent ec5751ba10 16888dd3ed

commit 1850805910

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