Merge branch 'feature/kotlin' into dev

This commit is contained in:
2017-07-21 18:12:45 -04:00
parent 2db4c06fe8
commit 180c18f6bf
147 changed files with 3835 additions and 5594 deletions

View File

@@ -237,7 +237,7 @@
<style name="ToolbarShadow">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">2dp</item>
<item name="android:background">@drawable/toolbar_shadow</item>
<item name="android:background">@drawable/shadow</item>
<item name="android:alpha">0.2</item>
</style>