Resolve conflict when pull (1b59cc92) · Commits · Alvin Limassa / TugasBesar1_2018 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

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

Alvin Limassa
TugasBesar1_2018
Commits
1b59cc92

Commit 1b59cc92 authored 6 years ago by

Jeffry

Downloads
- Patches
- Plain Diff

Resolve conflict when pull

parent d3ada127

Branches

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

controller/Account/CheckUsernameController.php 38 additions, 38 deletions

controller/Account/CheckUsernameController.php
controller/Account/LoginController.php 75 additions, 75 deletions

controller/Account/LoginController.php
controller/Account/RegisterController.php 71 additions, 71 deletions

controller/Account/RegisterController.php
controller/BaseController.php 139 additions, 139 deletions

controller/BaseController.php
controller/Image/GetImageController.php 30 additions, 30 deletions

controller/Image/GetImageController.php
entity/AccountEntity.php 56 additions, 56 deletions

entity/AccountEntity.php
entity/BaseEntity.php 56 additions, 56 deletions

entity/BaseEntity.php
entity/GenericEntity.php 56 additions, 56 deletions

entity/GenericEntity.php
entity/ImageEntity.php 43 additions, 43 deletions

entity/ImageEntity.php
entity/TokenEntity.php 62 additions, 62 deletions

entity/TokenEntity.php
index.php 13 additions, 13 deletions

index.php
model/AccountModel.php 90 additions, 90 deletions

model/AccountModel.php
view/json.php 10 additions, 10 deletions

view/json.php

with 739 additions and 739 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