Merge remote-tracking branch 'origin/master' into new-bottom-bar

Browse source

# Conflicts:
#	app/build.gradle

...

This commit is contained in:

Karim Abou Zeid 2015-10-18 17:44:40 +02:00

parent 518cc67ecd 774783e748

commit 5fbef67b22

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

Diff content is not available