Merge branch 'master' into edit-profile
This commit is contained in:
commit
e15f1cfcab
21 changed files with 648 additions and 89 deletions
|
@ -2,7 +2,16 @@
|
|||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:id="@+id/status_share"
|
||||
android:title="@string/action_share"/>
|
||||
android:title="@string/action_share">
|
||||
<menu>
|
||||
<item
|
||||
android:id="@+id/status_share_link"
|
||||
android:title="@string/status_share_link" />
|
||||
<item
|
||||
android:id="@+id/status_share_content"
|
||||
android:title="@string/status_share_content"/>
|
||||
</menu>
|
||||
</item>
|
||||
<item android:title="@string/action_block"
|
||||
android:id="@+id/status_block" />
|
||||
<item android:title="@string/action_report"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue