Merge branch '354-private-chat-input-field' into 'master' (ee0c4c07) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

ee0c4c07

Commit ee0c4c07 authored 8 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '354-private-chat-input-field' into 'master'

synched conversation and forum input

Closes #354

See merge request !219

parents 192ee416 ac8c1c0e

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/res/drawable/round_button.xml 0 additions, 13 deletions

briar-android/res/drawable/round_button.xml
briar-android/res/drawable/social_send_now_white.xml 2 additions, 2 deletions

briar-android/res/drawable/social_send_now_white.xml
briar-android/res/layout/activity_conversation.xml 3 additions, 27 deletions

briar-android/res/layout/activity_conversation.xml
briar-android/res/layout/text_input_field.xml 3 additions, 2 deletions

briar-android/res/layout/text_input_field.xml
briar-android/src/org/briarproject/android/contact/ConversationActivity.java 3 additions, 4 deletions

...rg/briarproject/android/contact/ConversationActivity.java

with 11 additions and 48 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment