diff options
| author | Christian S <christian@pix-art.de> | 2015-10-31 17:14:53 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-10-31 17:14:53 +0100 |
| commit | c5dc1628a4068b8af3b2250080897e35937dc815 (patch) | |
| tree | 727ded0485a61fa64d613defb9b6917d9a6fa0ef /src/main/res/layout/activity_muc_details.xml | |
| parent | 107acd1a5b03d25aa38d1ad73b957482ea781035 (diff) | |
| parent | b9de159e97090e132b74e934bc42fa6186105fd2 (diff) | |
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/layout/activity_muc_details.xml')
| -rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 3c7027ff3..1ff6f95d2 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -6,6 +6,7 @@ android:background="@color/grey200"> <LinearLayout + android:id="@+id/muc_main_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical"> |