Merge remote-tracking branch 'origin/dev' into dev (2eabc6e2) · Commits · Hosea Nathanael Abetnego / IF3210-2024-Android-ABE · GitLab

Snippets Groups Projects

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.

Commit 2eabc6e2 authored 1 year ago by

Rinaldy Adin

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	app/src/main/java/com/example/abe/ui/scanner/ScannerFragment.kt

parents 492c3255 fcecf77f

Hide whitespace changes

Inline Side-by-side

Showing with 16 additions and 23 deletions

Please register or to comment