Merge branch '881-forumactivitytest-fails-due-to-custom-toolbar' into 'master' (d2608e28) · 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

d2608e28

Commit d2608e28 authored 8 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '881-forumactivitytest-fails-due-to-custom-toolbar' into 'master'

Fix ForumActivityTest and get rid of redundant theme definition

Closes #881

See merge request !474

parents 8cf02c5f c5df2100

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/AndroidManifest.xml 8 additions, 11 deletions

briar-android/src/main/AndroidManifest.xml
briar-android/src/main/res/values/themes.xml 8 additions, 21 deletions

briar-android/src/main/res/values/themes.xml
briar-android/src/test/java/org/briarproject/briar/android/forum/TestForumActivity.java 11 additions, 0 deletions

...g/briarproject/briar/android/forum/TestForumActivity.java

with 27 additions and 32 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