Merge remote-tracking branch 'origin/master' (1eae9efe) · Commits · IF3111-2018-07 / android · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

android
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- 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.

IF3111-2018-07
android
Commits
1eae9efe

Commit 1eae9efe authored 7 years ago by

robby syaifullah

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/values/strings.xml

parents 28f0370c d0ebe516

Branches

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.idea/misc.xml 1 addition, 1 deletion

.idea/misc.xml
.idea/modules.xml 1 addition, 1 deletion

.idea/modules.xml
.idea/vcs.xml 1 addition, 1 deletion

.idea/vcs.xml
app/src/main/AndroidManifest.xml 1 addition, 0 deletions

app/src/main/AndroidManifest.xml
app/src/main/java/com/example/leo/fitnessdiy/LoginActivity.java 18 additions, 0 deletions

...c/main/java/com/example/leo/fitnessdiy/LoginActivity.java
app/src/main/java/com/example/leo/fitnessdiy/MainActivity.java 1 addition, 0 deletions

...rc/main/java/com/example/leo/fitnessdiy/MainActivity.java
app/src/main/res/layout/activity_login.xml 35 additions, 0 deletions

app/src/main/res/layout/activity_login.xml
app/src/main/res/values/strings.xml 2 additions, 11 deletions

app/src/main/res/values/strings.xml
gradle.properties 16 additions, 9 deletions

gradle.properties

with 76 additions and 23 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