Merge branch 'development' into keybase-proofs

This commit is contained in:
Dominik Schürmann committed 2014-12-05 15:51:15 +01:00
commit 5c54ab1a0d
13 files changed
+31 -35

No files matched your search

@@ -19,7 +19,6 @@
android:layout_height="match_parent"
android:dividerPadding="12dp"
android:orientation="horizontal"
android:divider="@drawable/abc_list_divider_holo_light"
android:showDividers="end" >
<include layout="@layout/actionbar_include_done_button" />
@@ -18,7 +18,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:dividerPadding="12dp"
android:divider="@drawable/abc_list_divider_holo_light"
android:orientation="horizontal"
android:showDividers="middle">