Merge remote-tracking branch 'origin/master' (143e0c04) · Commits · HADJOUT YASMINE / SpySenger · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

SpySenger
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

HADJOUT YASMINE
SpySenger
Commits
143e0c04

Commit 143e0c04 authored 4 years ago by

Harrion VENIER

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

parents ad8f6963 eb4a2fd8

Branches

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/example/qrcode/MenuScanActivity.java 15 additions, 1 deletion

app/src/main/java/com/example/qrcode/MenuScanActivity.java
app/src/main/res/layout/activity_menu_scan.xml 23 additions, 10 deletions

app/src/main/res/layout/activity_menu_scan.xml
app/src/main/res/values-night/themes.xml 4 additions, 4 deletions

app/src/main/res/values-night/themes.xml
app/src/main/res/values/colors.xml 4 additions, 0 deletions

app/src/main/res/values/colors.xml
app/src/main/res/values/themes.xml 4 additions, 4 deletions

app/src/main/res/values/themes.xml

with 50 additions and 19 deletions

0% 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