Merge remote-tracking branch 'origin/new-now-playing-screen' into new-now-playing-screen

Browse source

# Conflicts:
#	app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java
#	app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java

...

This commit is contained in:

Karim Abou Zeid 2016-04-16 18:14:47 +02:00

parent 2a2b9fbda3 e7a896e3f4

commit 34f1a8a439

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