Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

PixelDroid
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

0718aead

Commit 0718aead authored 4 years ago by Matthieu

Downloads
- Plain Diff

Merge branch 'release_5' into 'master'

Alpha release 5

See merge request pixeldroid/PixelDroid!257

parents d53a0086 16529b40

No related branches found

Tags v1.0.alpha5

No related merge requests found

Changes 4

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/build.gradle 4 additions, 4 deletions

app/build.gradle
app/licenses.yml 12 additions, 6 deletions

app/licenses.yml
app/src/main/assets/licenses.html 381 additions, 134 deletions

app/src/main/assets/licenses.html
app/src/main/java/com/h/pixeldroid/MainActivity.kt 1 addition, 1 deletion

app/src/main/java/com/h/pixeldroid/MainActivity.kt

with 398 additions and 145 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