Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain

This commit is contained in:
Dominik Schürmann
2014-03-25 19:11:32 +01:00
32 changed files with 79 additions and 146 deletions

View File

@@ -72,7 +72,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="16dp">
android:paddingLeft="16dp"
android:paddingRight="4dip">
<TextView
android:id="@+id/mainUserId"
@@ -314,4 +315,4 @@
bootstrapbutton:bb_type="info"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</ScrollView>