Merge branch '396-convert-expiredactivity-to-xml' into 'master' (13669724) · 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

13669724

Commit 13669724 authored 8 years ago by str4d

Downloads
- Plain Diff

Merge branch '396-convert-expiredactivity-to-xml' into 'master'

Convert ExpiredActivity to XML

Closes #396

See merge request !196

parents ba928875 cac0f308

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/res/layout/activity_expired.xml 9 additions, 0 deletions

briar-android/res/layout/activity_expired.xml
briar-android/src/org/briarproject/android/ExpiredActivity.java 5 additions, 23 deletions

...android/src/org/briarproject/android/ExpiredActivity.java

with 14 additions and 23 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