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

0a3900e1

Commit 0a3900e1 authored 10 years ago by Parménides GV

Downloads
- Plain Diff

Merge branch 'develop'

parents 8083a343 fad9af56

No related branches found

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java 3 additions, 3 deletions

...debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
app/src/main/AndroidManifest.xml 1 addition, 1 deletion

app/src/main/AndroidManifest.xml
app/src/main/java/se/leap/bitmaskclient/Dashboard.java 21 additions, 14 deletions

app/src/main/java/se/leap/bitmaskclient/Dashboard.java
app/src/main/java/se/leap/bitmaskclient/EIP.java 5 additions, 0 deletions

app/src/main/java/se/leap/bitmaskclient/EIP.java
app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java 1 addition, 1 deletion

...lease/java/se/leap/bitmaskclient/ConfigurationWizard.java

with 31 additions and 19 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