Fakultas Ilmu Komputer UI

Skip to content
Snippets Groups Projects
Commit 522e1a83 authored by Ayu Annisa's avatar Ayu Annisa
Browse files

Merge branch 'task/instrumented-with-testsuite' of...

Merge branch 'task/instrumented-with-testsuite' of https://gitlab.cs.ui.ac.id/mihp26/MyUI-Dev into task/instrumented-with-testsuite

# Conflicts:
#	app/src/main/java/id/ac/ui/cs/myui/activity/news/NewsDetailActivity.java
#	app/src/main/java/id/ac/ui/cs/myui/activity/panic_button/PanicButtonActivity.java

Pull back
parents ed9385b5 e88c78b4
Branches
Tags
No related merge requests found
Showing
with 42 additions and 49 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment