Merge branch 'dev' into feat/twibbon (6f44aa1d) · Commits · Hosea Nathanael Abetnego / IF3210-2024-Android-ABE

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 6f44aa1d authored 1 year ago by

Rinaldy Adin

Browse files

Merge branch 'dev' into feat/twibbon

# Conflicts:
#	app/src/main/java/com/example/abe/MainActivityViewModel.kt

parents a76efc6d 8e76484a

1 merge request!19Feat/twibbon

Hide whitespace changes

Inline Side-by-side

Showing with 66 additions and 44 deletions

Please register or to comment

Admin message

Merge branch 'dev' into feat/twibbon