Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

bitmask_android
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

bdbd8b26

Commit bdbd8b26 authored 10 years ago by Parménides GV

Downloads
- Plain Diff

Merge branch 'develop' into release-0.9.4

parents fe1b2fd3 ed2256ef

No related branches found

No related tags found

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

app/build.gradle 1 addition, 1 deletion

app/build.gradle
app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java 0 additions, 6 deletions

...main/java/se/leap/bitmaskclient/userstatus/FabButton.java
app/src/main/res/drawable-hdpi/ic_account_circle.png 0 additions, 0 deletions

app/src/main/res/drawable-hdpi/ic_account_circle.png
app/src/main/res/drawable-mdpi/ic_account_circle.png 0 additions, 0 deletions

app/src/main/res/drawable-mdpi/ic_account_circle.png
app/src/main/res/drawable-xhdpi/ic_account_circle.png 0 additions, 0 deletions

app/src/main/res/drawable-xhdpi/ic_account_circle.png
app/src/main/res/drawable-xxhdpi/ic_account_circle.png 0 additions, 0 deletions

app/src/main/res/drawable-xxhdpi/ic_account_circle.png
app/src/main/res/drawable-xxxhdpi/ic_account_circle.png 0 additions, 0 deletions

app/src/main/res/drawable-xxxhdpi/ic_account_circle.png
app/src/main/res/layout/user_session_fragment.xml 7 additions, 4 deletions

app/src/main/res/layout/user_session_fragment.xml

with 8 additions and 11 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