Merge dev into master

abalta · Aug 28, 2018 · acf6378 · acf6378
1 parent cbb89d7
commit acf6378
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 0 deletions.
diff --git a/.idea/markdown-exported-files.xml b/.idea/markdown-exported-files.xml
diff --git a/app/src/main/res/drawable-hdpi/sample_one.jpeg b/app/src/main/res/drawable-hdpi/sample_one.jpeg
diff --git a/app/src/main/res/drawable-hdpi/sample_two.jpeg b/app/src/main/res/drawable-hdpi/sample_two.jpeg
diff --git a/app/src/main/res/drawable-xhdpi/sample_one.jpeg b/app/src/main/res/drawable-xhdpi/sample_one.jpeg
diff --git a/app/src/main/res/drawable-xhdpi/sample_two.jpeg b/app/src/main/res/drawable-xhdpi/sample_two.jpeg
diff --git a/app/src/main/res/drawable-xxhdpi/sample_one.jpeg b/app/src/main/res/drawable-xxhdpi/sample_one.jpeg
diff --git a/app/src/main/res/drawable-xxhdpi/sample_two.jpeg b/app/src/main/res/drawable-xxhdpi/sample_two.jpeg
diff --git a/app/src/main/res/drawable-xxxhdpi/sample_one.jpeg b/app/src/main/res/drawable-xxxhdpi/sample_one.jpeg
diff --git a/app/src/main/res/drawable-xxxhdpi/sample_two.jpeg b/app/src/main/res/drawable-xxxhdpi/sample_two.jpeg